update upstream sources

[clinton/guile-figl.git] / upstream-doc / man4 / glTexImage2D.xml

diff --git a/upstream-doc/man4/glTexImage2D.xml b/upstream-doc/man4/glTexImage2D.xml
index 4370538..bb431d6 100644 (file)
--- a/upstream-doc/man4/glTexImage2D.xml
+++ b/upstream-doc/man4/glTexImage2D.xml
@@ -225,9 +225,7 @@
                         Each element is a single red component.
                         The GL converts it to floating point and assembles it into an RGBA element
                         by attaching 0 for green and blue, and 1 for alpha.
-                        Each component is then multiplied by the signed scale factor <constant>GL_c_SCALE</constant>,
-                        added to the signed bias <constant>GL_c_BIAS</constant>,
-                        and clamped to the range [0,1].
+                        Each component is clamped to the range [0,1].
                     </para>
                 </listitem>
             </varlistentry>
@@ -238,9 +236,7 @@
                         Each element is a red/green double.
                         The GL converts it to floating point and assembles it into an RGBA element
                         by attaching 0 for blue, and 1 for alpha.
-                        Each component is then multiplied by the signed scale factor <constant>GL_c_SCALE</constant>,
-                        added to the signed bias <constant>GL_c_BIAS</constant>,
-                        and clamped to the range [0,1].
+                        Each component is clamped to the range [0,1].
                     </para>
                 </listitem>
             </varlistentry>
@@ -256,9 +252,7 @@
                         Each element is an RGB triple.
                         The GL converts it to floating point and assembles it into an RGBA element
                         by attaching 1 for alpha.
-                        Each component is then multiplied by the signed scale factor <constant>GL_c_SCALE</constant>,
-                        added to the signed bias <constant>GL_c_BIAS</constant>,
-                        and clamped to the range [0,1].
+                        Each component is clamped to the range [0,1].
                     </para>
                 </listitem>
             </varlistentry>
@@ -272,9 +266,7 @@
                 <listitem>
                     <para>
                         Each element contains all four components.
-                        Each component is multiplied by the signed scale factor <constant>GL_c_SCALE</constant>,
-                        added to the signed bias <constant>GL_c_BIAS</constant>,
-                        and clamped to the range [0,1].
+                        Each component is clamped to the range [0,1].
                     </para>
                 </listitem>
             </varlistentry>
@@ -283,9 +275,7 @@
                 <listitem>
                     <para>
                         Each element is a single depth value.
-                        The GL converts it to floating point, multiplies by the signed scale factor
-                        <constant>GL_DEPTH_SCALE</constant>, adds the signed bias <constant>GL_DEPTH_BIAS</constant>,
-                        and clamps to the range [0,1].
+                        The GL converts it to floating point and clamps to the range [0,1].
                     </para>
                 </listitem>
             </varlistentry>
@@ -543,27 +533,6 @@
             <constant>GL_INVALID_VALUE</constant> is generated if <parameter>width</parameter> or <parameter>height</parameter> is less than 0
             or greater than <constant>GL_MAX_TEXTURE_SIZE</constant>.
         </para>
-        <para>
-            <constant>GL_INVALID_VALUE</constant> is generated if non-power-of-two textures are not supported and the <parameter>width</parameter> or <parameter>height</parameter> cannot be represented as 
-            <inlineequation><mml:math>
-                <!-- eqn: 2 sup k  +  2(border): -->
-                <mml:mrow>
-                    <mml:msup><mml:mn>2</mml:mn>
-                    <mml:mi mathvariant="italic">k</mml:mi>
-                    </mml:msup>
-                    <mml:mo>+</mml:mo>
-                    <mml:mrow>
-                        <mml:mn>2</mml:mn>
-                        <mml:mo>&af;</mml:mo>
-                        <mml:mfenced open="(" close=")">
-                            <mml:mi mathvariant="italic">border</mml:mi>
-                        </mml:mfenced>
-                    </mml:mrow>
-                </mml:mrow>
-            </mml:math></inlineequation>
-            for some
-            integer value of <emphasis>k</emphasis>.
-        </para>
         <para>
             <constant>GL_INVALID_VALUE</constant> is generated if <parameter>border</parameter> is not 0.
         </para>
@@ -656,7 +625,7 @@
     <refsect1 id="Copyright"><title>Copyright</title>
         <para>
             Copyright <trademark class="copyright"></trademark> 1991-2006 Silicon Graphics, Inc.
-            Copyright <trademark class="copyright"></trademark> 2011 Khronos Group.
+            Copyright <trademark class="copyright"></trademark> 2011-2013 Khronos Group.
             This document is licensed under the SGI
             Free Software B License. For details, see
             <ulink url="http://oss.sgi.com/projects/FreeB/">http://oss.sgi.com/projects/FreeB/</ulink>.