From e9345e9916c9d80d6bf8bd4c91e26d1183b6e69f Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Thu, 14 Oct 2010 21:10:51 +0000 Subject: [PATCH] Synced manpages with khronos svn r12696. --- .../Docs/glGetBufferPointerv.xml | 2 +- Source/Bind/Specifications/Docs/glTexEnv.xml | 220 +++++++++--------- Source/Bind/Specifications/Docs/glTexGen.xml | 4 +- 3 files changed, 107 insertions(+), 119 deletions(-) diff --git a/Source/Bind/Specifications/Docs/glGetBufferPointerv.xml b/Source/Bind/Specifications/Docs/glGetBufferPointerv.xml index f57cbd00..fb9b362e 100644 --- a/Source/Bind/Specifications/Docs/glGetBufferPointerv.xml +++ b/Source/Bind/Specifications/Docs/glGetBufferPointerv.xml @@ -91,7 +91,7 @@ GL_INVALID_OPERATION is generated if the reserved buffer object name 0 is bound to target. - GL_INVALID_OPERATION is generated if glGetBufferParameteriv + GL_INVALID_OPERATION is generated if glGetBufferPointerv is executed between the execution of glBegin and the corresponding execution of glEnd. diff --git a/Source/Bind/Specifications/Docs/glTexEnv.xml b/Source/Bind/Specifications/Docs/glTexEnv.xml index 292009de..ac61d738 100644 --- a/Source/Bind/Specifications/Docs/glTexEnv.xml +++ b/Source/Bind/Specifications/Docs/glTexEnv.xml @@ -149,7 +149,7 @@ pname must be GL_TEXTURE_LOD_BIAS. When target is GL_TEXTURE_ENV, pname can be GL_TEXTURE_ENV_MODE, GL_TEXTURE_ENV_COLOR, GL_COMBINE_RGB, GL_COMBINE_ALPHA, - GL_RGB_SCALE, GL_ALPHA_SCALE, + GL_RGB_SCALE, GL_ALPHA_SCALE, GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, or GL_SRC2_ALPHA. @@ -179,7 +179,7 @@ t, I t - to texture source components. + to texture source components. C s and @@ -325,17 +325,17 @@ The following table shows how the RGBA color is produced for each of the first five texture functions that can be chosen. C - is a triple of color values (RGB) and + is a triple of color values (RGB) and A is the associated alpha value. RGBA values extracted from a texture image are in the range [0,1]. - The subscript + The subscript p refers to the color computed from the previous texture stage (or the incoming fragment if processing texture stage 0), - the subscript + the subscript s to the texture source color, - the subscript + the subscript c to the texture environment color, and the subscript @@ -1392,12 +1392,12 @@ GL_SRC0_RGB, GL_SRC1_RGB, GL_SRC2_RGB, GL_SRC0_ALPHA, GL_SRC1_ALPHA, and GL_SRC2_ALPHA, are combined to produce a final texture color. In the following tables, - GL_SRC0_c is represented by + GL_SRC0_c is represented by Arg0, GL_SRC1_c is - represented by + represented by Arg1, - and GL_SRC2_c is represented by + and GL_SRC2_c is represented by Arg2. @@ -1524,10 +1524,14 @@ GL_DOT3_RGB + or + GL_DOT3_RGBA + - 4 × @@ -1535,107 +1539,91 @@ - - Arg0 - r - + + + + Arg0 + r + + + - + 0.5 + + + × + + + + Arg1 + r + + + - + 0.5 + - - - 0.5 - × + + - - Arg1 - r - + + + + Arg0 + g + + + - + 0.5 + + + × + + + + Arg1 + g + + + - + 0.5 + + + + + + + + + + + + Arg0 + b + + + - + 0.5 + + + × + + + + Arg1 + b + + + - + 0.5 + - - - 0.5 - + - - - - - or - - - - - - - - - - Arg0 - g - - - - - 0.5 - - - × - - - - Arg1 - g - - - - - 0.5 - - - - - - + - - - - - GL_DOT3_RGBA - - - - - - - - - - Arg0 - b - - - - - 0.5 - - - × - - - - Arg1 - b - - - - - 0.5 - - - - - @@ -1771,7 +1759,7 @@ - In the following tables, the value + In the following tables, the value C @@ -1779,7 +1767,7 @@ represents the color sampled - from the currently bound texture, + from the currently bound texture, C @@ -1787,7 +1775,7 @@ represents the constant - texture-environment color, + texture-environment color, C @@ -1795,7 +1783,7 @@ represents the primary color of the - incoming fragment, and + incoming fragment, and C @@ -1803,7 +1791,7 @@ represents the color computed from the - previous texture stage or + previous texture stage or C @@ -1816,20 +1804,20 @@ A s - , + , A c - , + , A f , - and + and A @@ -1840,8 +1828,8 @@ alpha values. - The following table describes the values assigned to - Arg0, + The following table describes the values assigned to + Arg0, Arg1, and Arg2 @@ -2257,14 +2245,14 @@ - For GL_TEXTUREn sources, + For GL_TEXTUREn sources, C s - and + and A @@ -2272,12 +2260,12 @@ represent the color - and alpha, respectively, produced from texture stage + and alpha, respectively, produced from texture stage n. - The follow table describes the values assigned to - Arg0, + The follow table describes the values assigned to + Arg0, Arg1, and Arg2 @@ -2505,7 +2493,7 @@ The RGB and alpha results of the texture function are multipled by the values of GL_RGB_SCALE and GL_ALPHA_SCALE, respectively, and - clamped to the range + clamped to the range @@ -2540,7 +2528,7 @@ GL_TEXTURE_ENV_COLOR defaults to (0, 0, 0, 0). - If target is GL_POINT_SPRITE and pname is GL_COORD_REPLACE, the boolean value specified + If target is GL_POINT_SPRITE and pname is GL_COORD_REPLACE, the boolean value specified is used to either enable or disable point sprite texture coordinate replacement. The default value is GL_FALSE. diff --git a/Source/Bind/Specifications/Docs/glTexGen.xml b/Source/Bind/Specifications/Docs/glTexGen.xml index 1c935def..036adfcb 100644 --- a/Source/Bind/Specifications/Docs/glTexGen.xml +++ b/Source/Bind/Specifications/Docs/glTexGen.xml @@ -525,7 +525,7 @@ that can produce dynamic contour lines on moving objects. - If pname is GL_SPHERE_MAP and coord is either + If the texture generation function is GL_SPHERE_MAP and coord is either GL_S or GL_T, s @@ -717,7 +717,7 @@ plane equations are (0, 0, 0, 0). - When the ARB_multitexture extension is supported, glTexGen set the + When the ARB_multitexture extension is supported, glTexGen sets the texture generation parameters for the currently active texture unit, selected with glActiveTexture.