summaryrefslogtreecommitdiffstats
path: root/src/gallium/docs
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-09-13 19:38:25 +0200
committerMarek Olšák <[email protected]>2012-09-30 18:57:57 +0200
commitde80660c2bd43db112b6c82d970660ed9806cd33 (patch)
tree115c132994d540743e6deed23dec941f8eb619b4 /src/gallium/docs
parentd37e6b15ad545106d48af5c8abb75d0e28895d43 (diff)
gallium: remove resource_resolve
The functionality is provided by the new blit function. Tested-by: Michel Dänzer <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/docs')
-rw-r--r--src/gallium/docs/d3d11ddi.txt2
-rw-r--r--src/gallium/docs/source/context.rst14
2 files changed, 1 insertions, 15 deletions
diff --git a/src/gallium/docs/d3d11ddi.txt b/src/gallium/docs/d3d11ddi.txt
index 7cbcdc7e731..14a589fffe2 100644
--- a/src/gallium/docs/d3d11ddi.txt
+++ b/src/gallium/docs/d3d11ddi.txt
@@ -384,7 +384,7 @@ ResourceIsStagingBusy ->
ResourceReadAfterWriteHazard
- Gallium lacks this
-ResourceResolveSubresource -> resource_resolve
+ResourceResolveSubresource -> blit
ResourceMap
ResourceUnmap
diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst
index 29b38e50e4e..28096f804b1 100644
--- a/src/gallium/docs/source/context.rst
+++ b/src/gallium/docs/source/context.rst
@@ -444,20 +444,6 @@ the optimal method for blitting (like using a special 2D engine), and usually
offers, for example, accelerated stencil-only copies even where
PIPE_CAP_SHADER_STENCIL_EXPORT is not available.
-``resource_resolve`` resolves a multisampled resource into a non-multisampled
-one. Their formats must match. This function must be present if a driver
-supports multisampling.
-The region that is to be resolved is described by ``pipe_resolve_info``, which
-provides a source and a destination rectangle.
-The source rectangle may be vertically flipped, but otherwise the dimensions
-of the rectangles must match, unless PIPE_CAP_SCALED_RESOLVE is supported,
-in which case scaling and horizontal flipping are allowed as well.
-The result of resolving depth/stencil values may be any function of the values at
-the sample points, but returning the value of the centermost sample is preferred.
-
-The interfaces to these calls are likely to change to make it easier
-for a driver to batch multiple blits with the same source and
-destination.
Transfers
^^^^^^^^^