diff options
author | wm4 <wm4@nowhere> | 2014-11-18 16:30:24 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-11-18 16:30:32 +0100 |
commit | b8ac594af0cb2c0bfbf9a6f8b4571cf308a69a0f (patch) | |
tree | 983b241ceb7527a0a4e1d10989d30cf3f9f6ed86 /DOCS/man/vo.rst | |
parent | caf2fbf68896c36b4c4d20d3fd37327b5187dc01 (diff) | |
download | mpv-b8ac594af0cb2c0bfbf9a6f8b4571cf308a69a0f.tar.bz2 mpv-b8ac594af0cb2c0bfbf9a6f8b4571cf308a69a0f.tar.xz |
vo_direct3d: fix texture-memory sub-option, extend it
This sub-option was turned into a flag when the sub-option parser was
changed to the generic one (probably accidentally). Turn it into a
proper choice-option.
Also, adjust what the options do. Though none of this probably makes
much sense; the default should work, and if it doesn't, the GPU/driver
is probably beyond help.
Diffstat (limited to 'DOCS/man/vo.rst')
-rw-r--r-- | DOCS/man/vo.rst | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index e0dd002bff..a4e119224e 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -233,18 +233,29 @@ Available video output drivers are: Always force textures to power of 2, even if the device reports non-power-of-2 texture sizes as supported. - ``texture-memory=N`` + ``texture-memory=<mode>`` Only affects operation with shaders/texturing enabled, and (E)OSD. - Values for N: - - 0 - default, will often use an additional shadow texture + copy - 1 - use ``D3DPOOL_MANAGED`` - 2 - use ``D3DPOOL_DEFAULT`` - 3 - use ``D3DPOOL_SYSTEMMEM``, but without shadow texture + Possible values: + + ``default`` (default) + Use ``D3DPOOL_DEFAULT``, with a ``D3DPOOL_SYSTEMMEM`` texture for + locking. If the driver supports ``D3DDEVCAPS_TEXTURESYSTEMMEMORY``, + ``D3DPOOL_SYSTEMMEM`` is used directly. + + ``default-pool`` + Use ``D3DPOOL_DEFAULT``. (Like ``default``, but never use a + shadow-texture.) + + ``default-pool-shadow`` + Use ``D3DPOOL_DEFAULT``, with a ``D3DPOOL_SYSTEMMEM`` texture for + locking. (Like ``default``, but always force the shadow-texture.) + + ``managed`` + Use ``D3DPOOL_MANAGED``. + + ``scratch`` + Use ``D3DPOOL_SCRATCH``, with a ``D3DPOOL_SYSTEMMEM`` texture for + locking. ``swap-discard`` Use ``D3DSWAPEFFECT_DISCARD``, which might be faster. |