update upstream sources

[clinton/guile-figl.git] / upstream-doc / man3 / glCopyTexSubImage2D.xml

diff --git a/upstream-doc/man3/glCopyTexSubImage2D.xml b/upstream-doc/man3/glCopyTexSubImage2D.xml
index 332b0e2..8f098c1 100644 (file)
--- a/upstream-doc/man3/glCopyTexSubImage2D.xml
+++ b/upstream-doc/man3/glCopyTexSubImage2D.xml
@@ -173,8 +173,8 @@
             rendering context, then the values obtained for those pixels are undefined.
         </para>
         <para>
-            No change is made to the <emphasis>internalformat</emphasis>, <emphasis>width</emphasis>,
-            <emphasis>height</emphasis>, or <emphasis>border</emphasis> parameters of the specified texture
+            No change is made to the <emphasis>internalformat</emphasis>, <emphasis>width</emphasis> or
+            <emphasis>height</emphasis> parameters of the specified texture
             array or to texel values outside the specified subregion.
         </para>
     </refsect1>
@@ -190,8 +190,9 @@
             <constant>GL_TEXTURE_CUBE_MAP_NEGATIVE_X</constant>,
             <constant>GL_TEXTURE_CUBE_MAP_POSITIVE_Y</constant>,
             <constant>GL_TEXTURE_CUBE_MAP_NEGATIVE_Y</constant>,
-            <constant>GL_TEXTURE_CUBE_MAP_POSITIVE_Z</constant>, or
-            <constant>GL_TEXTURE_CUBE_MAP_NEGATIVE_Z</constant>.
+            <constant>GL_TEXTURE_CUBE_MAP_POSITIVE_Z</constant>,
+            <constant>GL_TEXTURE_CUBE_MAP_NEGATIVE_Z</constant>, or
+            <constant>GL_TEXTURE_1D_ARRAY</constant>.
         </para>
         <para>
             <constant>GL_INVALID_OPERATION</constant> is generated if the texture array has not been
@@ -229,10 +230,7 @@
                 <mml:mrow>
                     <mml:mi mathvariant="italic">xoffset</mml:mi>
                     <mml:mo>&lt;</mml:mo>
-                    <mml:mrow>
-                        <mml:mo>-</mml:mo>
-                        <mml:mi mathvariant="italic">b</mml:mi>
-                    </mml:mrow>
+                    <mml:mn>0</mml:mn>
                 </mml:mrow>
             </mml:math></inlineequation>,
             <inlineequation><mml:math>
@@ -246,13 +244,9 @@
                         </mml:mrow>
                     </mml:mfenced>
                     <mml:mo>&gt;</mml:mo>
-                    <mml:mfenced open="(" close=")">
-                        <mml:mrow>
-                            <mml:mi mathvariant="italic">w</mml:mi>
-                            <mml:mo>-</mml:mo>
-                            <mml:mi mathvariant="italic">b</mml:mi>
-                        </mml:mrow>
-                    </mml:mfenced>
+                    <mml:mrow>
+                        <mml:mi mathvariant="italic">w</mml:mi>
+                    </mml:mrow>
                 </mml:mrow>
             </mml:math></inlineequation>,
             <inlineequation><mml:math>
@@ -260,10 +254,7 @@
                 <mml:mrow>
                     <mml:mi mathvariant="italic">yoffset</mml:mi>
                     <mml:mo>&lt;</mml:mo>
-                    <mml:mrow>
-                        <mml:mo>-</mml:mo>
-                        <mml:mi mathvariant="italic">b</mml:mi>
-                    </mml:mrow>
+                    <mml:mn>0</mml:mn>
                 </mml:mrow>
             </mml:math></inlineequation>,
             or
@@ -278,29 +269,15 @@
                         </mml:mrow>
                     </mml:mfenced>
                     <mml:mo>&gt;</mml:mo>
-                    <mml:mfenced open="(" close=")">
-                        <mml:mrow>
-                            <mml:mi mathvariant="italic">h</mml:mi>
-                            <mml:mo>-</mml:mo>
-                            <mml:mi mathvariant="italic">b</mml:mi>
-                        </mml:mrow>
-                    </mml:mfenced>
+                    <mml:mi mathvariant="italic">h</mml:mi>
                 </mml:mrow>
             </mml:math></inlineequation>,
             where 
             <inlineequation><mml:math><mml:mi mathvariant="italic">w</mml:mi></mml:math></inlineequation>
-            is the <constant>GL_TEXTURE_WIDTH</constant>,
+            is the <constant>GL_TEXTURE_WIDTH</constant>, and
             <inlineequation><mml:math><mml:mi mathvariant="italic">h</mml:mi></mml:math></inlineequation>
-            is the <constant>GL_TEXTURE_HEIGHT</constant>,
-            and 
-            <inlineequation><mml:math><mml:mi mathvariant="italic">b</mml:mi></mml:math></inlineequation>
-            is the <constant>GL_TEXTURE_BORDER</constant>
+            is the <constant>GL_TEXTURE_HEIGHT</constant>
             of the texture image being modified.
-            Note that 
-            <inlineequation><mml:math><mml:mi mathvariant="italic">w</mml:mi></mml:math></inlineequation>
-            and 
-            <inlineequation><mml:math><mml:mi mathvariant="italic">h</mml:mi></mml:math></inlineequation>
-            include twice the border width.
         </para>
     </refsect1>
     <refsect1 id="associatedgets"><title>Associated Gets</title>