Synced manpages with khronos svn r12696.

This commit is contained in:
the_fiddler 2010-10-14 21:10:51 +00:00
parent 2206305cf8
commit e9345e9916
3 changed files with 107 additions and 119 deletions

View file

@ -91,7 +91,7 @@
<constant>GL_INVALID_OPERATION</constant> is generated if the reserved buffer object name 0 is bound to <parameter>target</parameter>. <constant>GL_INVALID_OPERATION</constant> is generated if the reserved buffer object name 0 is bound to <parameter>target</parameter>.
</para> </para>
<para> <para>
<constant>GL_INVALID_OPERATION</constant> is generated if <function>glGetBufferParameteriv</function> <constant>GL_INVALID_OPERATION</constant> is generated if <function>glGetBufferPointerv</function>
is executed between the execution of <citerefentry><refentrytitle>glBegin</refentrytitle></citerefentry> is executed between the execution of <citerefentry><refentrytitle>glBegin</refentrytitle></citerefentry>
and the corresponding execution of <citerefentry><refentrytitle>glEnd</refentrytitle></citerefentry>. and the corresponding execution of <citerefentry><refentrytitle>glEnd</refentrytitle></citerefentry>.
</para> </para>

View file

@ -1524,10 +1524,14 @@
<row> <row>
<entry align="left"> <entry align="left">
<constant>GL_DOT3_RGB</constant> <constant>GL_DOT3_RGB</constant>
or
<constant>GL_DOT3_RGBA</constant>
</entry> </entry>
<entry align="left"> <entry align="left">
<!-- eqn: 4 * ((({Arg0 sub r} - 0.5) * ({Arg1 sub r} - 0.5)) +
(({Arg0 sub g} - 0.5) * ({Arg1 sub g} - 0.5)) +
(({Arg0 sub b} - 0.5) * ({Arg1 sub b} - 0.5)):-->
<inlineequation><mml:math> <inlineequation><mml:math>
<!-- eqn: 4 * (({Arg0 sub r} - 0.5) * ({Arg1 sub r} - 0.5)):-->
<mml:mrow> <mml:mrow>
<mml:mn>4</mml:mn> <mml:mn>4</mml:mn>
<mml:mo>&times;</mml:mo> <mml:mo>&times;</mml:mo>
@ -1535,107 +1539,91 @@
<mml:mrow> <mml:mrow>
<mml:mfenced open="(" close=")"> <mml:mfenced open="(" close=")">
<mml:mrow> <mml:mrow>
<mml:mfenced open="" close=""> <mml:mfenced open="(" close=")">
<mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi> <mml:mrow>
<mml:mi mathvariant="italic">r</mml:mi> <mml:mfenced open="" close="">
</mml:msub> <mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi>
<mml:mi mathvariant="italic">r</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
<mml:mo>&times;</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi>
<mml:mi mathvariant="italic">r</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced> </mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow> </mml:mrow>
</mml:mfenced> </mml:mfenced>
<mml:mo>&times;</mml:mo> <mml:mo>+</mml:mo>
<mml:mfenced open="(" close=")"> <mml:mfenced open="(" close=")">
<mml:mrow> <mml:mrow>
<mml:mfenced open="" close=""> <mml:mfenced open="(" close=")">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi> <mml:mrow>
<mml:mi mathvariant="italic">r</mml:mi> <mml:mfenced open="" close="">
</mml:msub> <mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi>
<mml:mi mathvariant="italic">g</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
<mml:mo>&times;</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi>
<mml:mi mathvariant="italic">g</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
</mml:mrow>
</mml:mfenced>
<mml:mo>+</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi>
<mml:mi mathvariant="italic">b</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
<mml:mo>&times;</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi>
<mml:mi mathvariant="italic">b</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced> </mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow> </mml:mrow>
</mml:mfenced> </mml:mfenced>
</mml:mrow> </mml:mrow>
</mml:mfenced> </mml:mfenced>
</mml:mrow> </mml:mrow>
</mml:math></inlineequation> </mml:math></inlineequation>
+
</entry>
</row>
<row>
<entry align="left">
or
</entry>
<entry align="left">
<inlineequation><mml:math>
<!-- eqn: (({Arg0 sub g} - 0.5) * ({Arg1 sub g} - 0.5)):-->
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi>
<mml:mi mathvariant="italic">g</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
<mml:mo>&times;</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi>
<mml:mi mathvariant="italic">g</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
</mml:mrow>
</mml:mfenced>
</mml:math></inlineequation>
+
</entry>
</row>
<row>
<entry align="left">
<constant>GL_DOT3_RGBA</constant>
</entry>
<entry align="left">
<inlineequation><mml:math>
<!-- eqn: (({Arg0 sub b} - 0.5) * ({Arg1 sub b} - 0.5)):-->
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg0</mml:mi>
<mml:mi mathvariant="italic">b</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
<mml:mo>&times;</mml:mo>
<mml:mfenced open="(" close=")">
<mml:mrow>
<mml:mfenced open="" close="">
<mml:msub><mml:mi mathvariant="italic">Arg1</mml:mi>
<mml:mi mathvariant="italic">b</mml:mi>
</mml:msub>
</mml:mfenced>
<mml:mo>-</mml:mo>
<mml:mn>0.5</mml:mn>
</mml:mrow>
</mml:mfenced>
</mml:mrow>
</mml:mfenced>
</mml:math></inlineequation>
</entry> </entry>
</row> </row>
</tbody> </tbody>

View file

@ -525,7 +525,7 @@
that can produce dynamic contour lines on moving objects. that can produce dynamic contour lines on moving objects.
</para> </para>
<para> <para>
If <parameter>pname</parameter> is <constant>GL_SPHERE_MAP</constant> and <parameter>coord</parameter> is either If the texture generation function is <constant>GL_SPHERE_MAP</constant> and <parameter>coord</parameter> is either
<constant>GL_S</constant> or <constant>GL_S</constant> or
<constant>GL_T</constant>, <constant>GL_T</constant>,
<inlineequation><mml:math><mml:mi mathvariant="italic">s</mml:mi></mml:math></inlineequation> <inlineequation><mml:math><mml:mi mathvariant="italic">s</mml:mi></mml:math></inlineequation>
@ -717,7 +717,7 @@
plane equations are (0, 0, 0, 0). plane equations are (0, 0, 0, 0).
</para> </para>
<para> <para>
When the <code>ARB_multitexture</code> extension is supported, <function>glTexGen</function> set the When the <code>ARB_multitexture</code> extension is supported, <function>glTexGen</function> sets the
texture generation parameters for the currently active texture unit, texture generation parameters for the currently active texture unit,
selected with <citerefentry><refentrytitle>glActiveTexture</refentrytitle></citerefentry>. selected with <citerefentry><refentrytitle>glActiveTexture</refentrytitle></citerefentry>.
</para> </para>