summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2010-01-28 13:37:09 -0800
committerCorbin Simpson <[email protected]>2010-01-28 13:37:09 -0800
commit2e481e9fad946ffb0e3121a2e9d3531e131da0ec (patch)
tree563137937061eaed597eeac4d3a92bdc9a0617e7
parent505a43aff23d0a6b71f89c25fc67f097cfa8c080 (diff)
gallium-docs: Minor grammar, need to talk about dual-source blends.
-rw-r--r--src/gallium/docs/source/cso/blend.rst12
-rw-r--r--src/gallium/docs/source/screen.rst3
2 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/docs/source/cso/blend.rst b/src/gallium/docs/source/cso/blend.rst
index 3fc573054e6..55c0f328859 100644
--- a/src/gallium/docs/source/cso/blend.rst
+++ b/src/gallium/docs/source/cso/blend.rst
@@ -6,6 +6,14 @@ Blend
This state controls blending of the final fragments into the target rendering
buffers.
+Blend Factors
+-------------
+
+The blend factors largely follow the same pattern as their counterparts
+in other modern and legacy drawing APIs.
+
+XXX blurb about dual-source blends
+
Members
-------
@@ -22,9 +30,9 @@ logicop_func
dither
Whether dithering is enabled.
rt
- Contains the per rendertarget blend state.
+ Contains the per-rendertarget blend state.
-per rendertarget members
+Per-rendertarget Members
------------------------
blend_enable
diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index 39938f7bb79..f2421c74ae4 100644
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -23,7 +23,8 @@ The integer capabilities:
* ``TWO_SIDED_STENCIL``: Whether the stencil test can also affect back-facing
polygons.
* ``GLSL``: Deprecated.
-* ``S3TC``: Deprecated.
+* ``DUAL_SOURCE_BLEND``: Whether dual-source blend factors are supported. See
+ :ref:`Blend` for more information.
* ``ANISOTROPIC_FILTER``: Whether textures can be filtered anisotropically.
* ``POINT_SPRITE``: Whether point sprites are available.
* ``MAX_RENDER_TARGETS``: The maximum number of render targets that may be