Mesa (master): gallium-docs: Minor grammar, need to talk about dual-source blends.

Corbin Simpson csimpson at kemper.freedesktop.org
Thu Jan 28 21:41:40 UTC 2010


Module: Mesa
Branch: master
Commit: 2e481e9fad946ffb0e3121a2e9d3531e131da0ec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e481e9fad946ffb0e3121a2e9d3531e131da0ec

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Thu Jan 28 13:37:09 2010 -0800

gallium-docs: Minor grammar, need to talk about dual-source blends.

---

 src/gallium/docs/source/cso/blend.rst |   12 ++++++++++--
 src/gallium/docs/source/screen.rst    |    3 ++-
 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 3fc5730..55c0f32 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 39938f7..f2421c7 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




More information about the mesa-commit mailing list