On 12 March 2012 14:41, Paul Berry <span dir="ltr"><<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This patch corrects a few minor errors in the OpenGL API spec files<br>
from <a href="http://www.opengl.org/registry/" target="_blank">http://www.opengl.org/registry/</a>:<br>
<br>
- ALL_ATTRIB_BITS was incorrectly defined as 0xFFFFFFFF. The correct<br>
value is 0x000FFFFF, since ALL_ATTRIB_BITS is not meant to apply to<br>
MULTISAMPLE_BIT (see extension specs 3DFX_multisample,<br>
ARB_multisample, EXT_multisample, and SGIS_multisample).<br>
<br>
- IsProgramARB and IsProgramNV were incorrectly marked as aliases of<br>
each other. This is not the case, since IsProgram is used for GLSL<br>
programs, and IsProgramARB/IsProgramNV are used for assembly<br>
programs.<br></blockquote><div><br>Whoops, the first sentence of this paragraph should have said "IsProgramARB and IsProgramNV were incorrectly marked as aliases of IsProgram." Sorry for the confusion.<br> </div>
<blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
- GenVertexArraysAPPLE was incorrectly marked as an alias for<br>
"GenVertexArray". There is no such function--the correct function<br>
is "GenVertexArrays".<br>
<br>
- TransformFeedbackVaryingsNV was incorrectly marked as an alias for<br>
TransformFeedbackVaryings. This is incorrect--the two functions<br>
interpret their arguments differently. Similarly,<br>
GetTransformFeedbackVaryingNV was incorrectly marked as an alias for<br>
GetTransformFeedbackVarying.<br>
<br>
- StencilFuncSeparateATI was incorrectly marked as an alias for<br>
StencilFuncSeparate. This is incorrect--the two functions interpret<br>
their arguments differently.<br>
<br>
- NV functions dealing with vertex attributes<br>
(GetVertexAttrib{d,f,i}vNV, VertexAttrib{1,2,3,4}{d,f,s}{,v}NV, and<br>
VertexAttrib4ub{,v}NV) were incorrectly marked as an alias for the<br>
corresponding core functions. This is incorrect--NV extensions<br>
handle vertex attribute numbering differently.<br>
<br>
The reason these errors were not caught by the maintainers of<br>
<a href="http://opengl.org" target="_blank">opengl.org</a> is likely because they don't affect the contents of the<br>
glext.h header file.<br>
---<br>
glapi/enumext.spec | 2 +-<br>
glapi/gl.spec | 37 ++-----------------------------------<br>
2 files changed, 3 insertions(+), 36 deletions(-)<br>
<br>
diff --git a/glapi/enumext.spec b/glapi/enumext.spec<br>
index 52fedfb..ead6983 100644<br>
--- a/glapi/enumext.spec<br>
+++ b/glapi/enumext.spec<br>
@@ -271,7 +271,7 @@ passthru: /* AttribMask */<br>
LIST_BIT = 0x00020000 # AttribMask<br>
TEXTURE_BIT = 0x00040000 # AttribMask<br>
SCISSOR_BIT = 0x00080000 # AttribMask<br>
- ALL_ATTRIB_BITS = 0xFFFFFFFF # AttribMask<br>
+ ALL_ATTRIB_BITS = 0x000FFFFF # AttribMask<br>
passthru: /* ClientAttribMask */<br>
CLIENT_PIXEL_STORE_BIT = 0x00000001 # ClientAttribMask<br>
CLIENT_VERTEX_ARRAY_BIT = 0x00000002 # ClientAttribMask<br>
diff --git a/glapi/gl.spec b/glapi/gl.spec<br>
index 772a9d6..126dac2 100644<br>
--- a/glapi/gl.spec<br>
+++ b/glapi/gl.spec<br>
@@ -9774,7 +9774,6 @@ IsProgramARB(program)<br>
version 1.3<br>
extension soft WINSOFT NV10<br>
glxvendorpriv 1304<br>
- alias IsProgram<br>
<br>
<br>
###############################################################################<br>
@@ -20620,7 +20619,6 @@ GetVertexAttribdvNV(index, pname, params)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxvendorpriv 1301<br>
- alias GetVertexAttribdv<br>
<br>
GetVertexAttribfvNV(index, pname, params)<br>
return void<br>
@@ -20632,7 +20630,6 @@ GetVertexAttribfvNV(index, pname, params)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxvendorpriv 1302<br>
- alias GetVertexAttribfv<br>
<br>
GetVertexAttribivNV(index, pname, params)<br>
return void<br>
@@ -20644,7 +20641,6 @@ GetVertexAttribivNV(index, pname, params)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxvendorpriv 1303<br>
- alias GetVertexAttribiv<br>
<br>
GetVertexAttribPointervNV(index, pname, pointer)<br>
return void<br>
@@ -20666,7 +20662,7 @@ IsProgramNV(id)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxvendorpriv 1304<br>
- alias IsProgram<br>
+ alias IsProgramARB<br>
<br>
LoadProgramNV(target, id, len, program)<br>
return void<br>
@@ -20874,7 +20870,6 @@ VertexAttrib1dNV(index, x)<br>
version 1.2<br>
vectorequiv VertexAttrib1dvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib1d<br>
<br>
VertexAttrib1dvNV(index, v)<br>
return void<br>
@@ -20884,7 +20879,6 @@ VertexAttrib1dvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4197<br>
- alias VertexAttrib1dv<br>
<br>
VertexAttrib1fNV(index, x)<br>
return void<br>
@@ -20894,7 +20888,6 @@ VertexAttrib1fNV(index, x)<br>
version 1.2<br>
vectorequiv VertexAttrib1fvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib1f<br>
<br>
VertexAttrib1fvNV(index, v)<br>
return void<br>
@@ -20904,7 +20897,6 @@ VertexAttrib1fvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4193<br>
- alias VertexAttrib1fv<br>
<br>
VertexAttrib1sNV(index, x)<br>
return void<br>
@@ -20914,7 +20906,6 @@ VertexAttrib1sNV(index, x)<br>
version 1.2<br>
vectorequiv VertexAttrib1svNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib1s<br>
<br>
VertexAttrib1svNV(index, v)<br>
return void<br>
@@ -20924,7 +20915,6 @@ VertexAttrib1svNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4189<br>
- alias VertexAttrib1sv<br>
<br>
VertexAttrib2dNV(index, x, y)<br>
return void<br>
@@ -20935,7 +20925,6 @@ VertexAttrib2dNV(index, x, y)<br>
version 1.2<br>
vectorequiv VertexAttrib2dvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib2d<br>
<br>
VertexAttrib2dvNV(index, v)<br>
return void<br>
@@ -20945,7 +20934,6 @@ VertexAttrib2dvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4198<br>
- alias VertexAttrib2dv<br>
<br>
VertexAttrib2fNV(index, x, y)<br>
return void<br>
@@ -20956,7 +20944,6 @@ VertexAttrib2fNV(index, x, y)<br>
version 1.2<br>
vectorequiv VertexAttrib2fvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib2f<br>
<br>
VertexAttrib2fvNV(index, v)<br>
return void<br>
@@ -20966,7 +20953,6 @@ VertexAttrib2fvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4194<br>
- alias VertexAttrib2fv<br>
<br>
VertexAttrib2sNV(index, x, y)<br>
return void<br>
@@ -20977,7 +20963,6 @@ VertexAttrib2sNV(index, x, y)<br>
version 1.2<br>
vectorequiv VertexAttrib2svNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib2s<br>
<br>
VertexAttrib2svNV(index, v)<br>
return void<br>
@@ -20987,7 +20972,6 @@ VertexAttrib2svNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4190<br>
- alias VertexAttrib2sv<br>
<br>
VertexAttrib3dNV(index, x, y, z)<br>
return void<br>
@@ -20999,7 +20983,6 @@ VertexAttrib3dNV(index, x, y, z)<br>
version 1.2<br>
vectorequiv VertexAttrib3dvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib3d<br>
<br>
VertexAttrib3dvNV(index, v)<br>
return void<br>
@@ -21009,7 +20992,6 @@ VertexAttrib3dvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4199<br>
- alias VertexAttrib3dv<br>
<br>
VertexAttrib3fNV(index, x, y, z)<br>
return void<br>
@@ -21021,7 +21003,6 @@ VertexAttrib3fNV(index, x, y, z)<br>
version 1.2<br>
vectorequiv VertexAttrib3fvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib3f<br>
<br>
VertexAttrib3fvNV(index, v)<br>
return void<br>
@@ -21031,7 +21012,6 @@ VertexAttrib3fvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4195<br>
- alias VertexAttrib3fv<br>
<br>
VertexAttrib3sNV(index, x, y, z)<br>
return void<br>
@@ -21043,7 +21023,6 @@ VertexAttrib3sNV(index, x, y, z)<br>
version 1.2<br>
vectorequiv VertexAttrib3svNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib3s<br>
<br>
VertexAttrib3svNV(index, v)<br>
return void<br>
@@ -21053,7 +21032,6 @@ VertexAttrib3svNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4191<br>
- alias VertexAttrib3sv<br>
<br>
VertexAttrib4dNV(index, x, y, z, w)<br>
return void<br>
@@ -21066,7 +21044,6 @@ VertexAttrib4dNV(index, x, y, z, w)<br>
version 1.2<br>
vectorequiv VertexAttrib4dvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib4d<br>
<br>
VertexAttrib4dvNV(index, v)<br>
return void<br>
@@ -21076,7 +21053,6 @@ VertexAttrib4dvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4200<br>
- alias VertexAttrib4dv<br>
<br>
VertexAttrib4fNV(index, x, y, z, w)<br>
return void<br>
@@ -21089,7 +21065,6 @@ VertexAttrib4fNV(index, x, y, z, w)<br>
version 1.2<br>
vectorequiv VertexAttrib4fvNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib4f<br>
<br>
VertexAttrib4fvNV(index, v)<br>
return void<br>
@@ -21099,7 +21074,6 @@ VertexAttrib4fvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4196<br>
- alias VertexAttrib4fv<br>
<br>
VertexAttrib4sNV(index, x, y, z, w)<br>
return void<br>
@@ -21112,7 +21086,6 @@ VertexAttrib4sNV(index, x, y, z, w)<br>
version 1.2<br>
vectorequiv VertexAttrib4svNV<br>
extension soft WINSOFT NV10<br>
- alias VertexAttrib4s<br>
<br>
VertexAttrib4svNV(index, v)<br>
return void<br>
@@ -21122,7 +21095,6 @@ VertexAttrib4svNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4192<br>
- alias VertexAttrib4sv<br>
<br>
VertexAttrib4ubNV(index, x, y, z, w)<br>
return void<br>
@@ -21135,7 +21107,6 @@ VertexAttrib4ubNV(index, x, y, z, w)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
vectorequiv VertexAttrib4ubvNV<br>
- alias VertexAttrib4Nub<br>
<br>
VertexAttrib4ubvNV(index, v)<br>
return void<br>
@@ -21145,7 +21116,6 @@ VertexAttrib4ubvNV(index, v)<br>
version 1.2<br>
extension soft WINSOFT NV10<br>
glxropcode 4201<br>
- alias VertexAttrib4Nubv<br>
<br>
VertexAttribs1dvNV(index, count, v)<br>
return void<br>
@@ -23341,7 +23311,7 @@ GenVertexArraysAPPLE(n, arrays)<br>
extension<br>
glxropcode ?<br>
glxflags ignore<br>
- alias GenVertexArray<br>
+ alias GenVertexArrays<br>
<br>
IsVertexArrayAPPLE(array)<br>
return Boolean<br>
@@ -24241,7 +24211,6 @@ StencilFuncSeparateATI(frontfunc, backfunc, ref, mask)<br>
extension<br>
glxropcode ?<br>
glxflags ignore<br>
- alias StencilFuncSeparate<br>
<br>
###############################################################################<br>
#<br>
@@ -26066,7 +26035,6 @@ TransformFeedbackVaryingsNV(program, count, locations, bufferMode)<br>
glxflags ignore<br>
glfflags ignore<br>
extension soft WINSOFT<br>
- alias TransformFeedbackVaryings<br>
<br>
ActiveVaryingNV(program, name)<br>
return void<br>
@@ -26117,7 +26085,6 @@ GetTransformFeedbackVaryingNV(program, index, location)<br>
extension soft WINSOFT<br>
glfflags ignore<br>
glxflags ignore<br>
- alias GetTransformFeedbackVarying<br>
<br>
# These commands require ARB_transform_feedback3<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.7.6<br>
<br>
</font></span></blockquote></div><br>