diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:50:50 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:50:50 +0000 |
| commit | 9130ec005fbc78a62420643414d8354d0929ca50 (patch) | |
| tree | 6762777acdd2d4eee17ef87290e80dc7afe2b73d /lib/mesa/src/mapi/glapi/gen/gl_API.xml | |
| parent | ca11beabae33eb59fb981b8adf50b1d47a2a98f0 (diff) | |
Merge Mesa 21.1.5
Diffstat (limited to 'lib/mesa/src/mapi/glapi/gen/gl_API.xml')
| -rw-r--r-- | lib/mesa/src/mapi/glapi/gen/gl_API.xml | 778 |
1 files changed, 434 insertions, 344 deletions
diff --git a/lib/mesa/src/mapi/glapi/gen/gl_API.xml b/lib/mesa/src/mapi/glapi/gen/gl_API.xml index 1cee28f31..f0496a142 100644 --- a/lib/mesa/src/mapi/glapi/gen/gl_API.xml +++ b/lib/mesa/src/mapi/glapi/gen/gl_API.xml @@ -1088,6 +1088,7 @@ <type name="double" size="8" float="true" glx_name="FLOAT64"/> <type name="clampd" size="8" float="true" glx_name="FLOAT64"/> + <type name="halfNV" size="2" float="true" glx_name="FLOAT16"/> <type name="float" size="4" float="true" glx_name="FLOAT32"/> <type name="clampf" size="4" float="true" glx_name="FLOAT32"/> @@ -1109,29 +1110,35 @@ <type name="DEBUGPROCARB" size="4" pointer="true"/> <type name="DEBUGPROC" size="4" pointer="true"/> - <function name="NewList" deprecated="3.1" marshal_fail="true"> + <function name="NewList" deprecated="3.1" + marshal_call_after="_mesa_glthread_NewList(ctx, list, mode);"> <param name="list" type="GLuint"/> <param name="mode" type="GLenum"/> <glx sop="101"/> </function> - <function name="EndList" deprecated="3.1"> + <function name="EndList" deprecated="3.1" + marshal_call_after="_mesa_glthread_EndList(ctx);"> <glx sop="102"/> </function> - <function name="CallList" deprecated="3.1"> + <function name="CallList" deprecated="3.1" + marshal_call_after="_mesa_glthread_CallList(ctx, list);"> <param name="list" type="GLuint"/> <glx rop="1"/> </function> - <function name="CallLists" deprecated="3.1"> + <function name="CallLists" deprecated="3.1" + marshal_call_after="_mesa_glthread_CallLists(ctx, n, type, lists);"> <param name="n" type="GLsizei" counter="true"/> <param name="type" type="GLenum"/> - <param name="lists" type="const GLvoid *" variable_param="type" count="n"/> + <param name="lists" type="const GLvoid *" variable_param="type" count="n" + marshal_count="(n * _mesa_calllists_enum_to_count(type))"/> <glx rop="2" large="true"/> </function> - <function name="DeleteLists" deprecated="3.1"> + <function name="DeleteLists" deprecated="3.1" + marshal_call_after="_mesa_glthread_DeleteLists(ctx, range);"> <param name="list" type="GLuint"/> <param name="range" type="GLsizei"/> <glx sop="103"/> @@ -1143,7 +1150,8 @@ <glx sop="104"/> </function> - <function name="ListBase" deprecated="3.1"> + <function name="ListBase" deprecated="3.1" + marshal_call_after="_mesa_glthread_ListBase(ctx, base);"> <param name="base" type="GLuint"/> <glx rop="3"/> </function> @@ -1153,7 +1161,8 @@ <glx rop="4"/> </function> - <function name="Bitmap" deprecated="3.1"> + <function name="Bitmap" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="xorig" type="GLfloat"/> @@ -1164,24 +1173,24 @@ <glx rop="5" large="true"/> </function> - <function name="Color3b" vectorequiv="Color3bv" deprecated="3.1"> + <function name="Color3b" vectorequiv="Color3bv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="Color3bv" deprecated="3.1"> + <function name="Color3bv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="6"/> </function> - <function name="Color3d" vectorequiv="Color3dv" deprecated="3.1"> + <function name="Color3d" vectorequiv="Color3dv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="Color3dv" deprecated="3.1"> + <function name="Color3dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="7"/> </function> @@ -1198,81 +1207,81 @@ <glx rop="8"/> </function> - <function name="Color3i" vectorequiv="Color3iv" deprecated="3.1"> + <function name="Color3i" vectorequiv="Color3iv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="Color3iv" deprecated="3.1"> + <function name="Color3iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="3"/> <glx rop="9"/> </function> - <function name="Color3s" vectorequiv="Color3sv" deprecated="3.1"> + <function name="Color3s" vectorequiv="Color3sv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="Color3sv" deprecated="3.1"> + <function name="Color3sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="3"/> <glx rop="10"/> </function> - <function name="Color3ub" vectorequiv="Color3ubv" deprecated="3.1"> + <function name="Color3ub" vectorequiv="Color3ubv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="Color3ubv" deprecated="3.1"> + <function name="Color3ubv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="11"/> </function> - <function name="Color3ui" vectorequiv="Color3uiv" deprecated="3.1"> + <function name="Color3ui" vectorequiv="Color3uiv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="Color3uiv" deprecated="3.1"> + <function name="Color3uiv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLuint *" count="3"/> <glx rop="12"/> </function> - <function name="Color3us" vectorequiv="Color3usv" deprecated="3.1"> + <function name="Color3us" vectorequiv="Color3usv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="Color3usv" deprecated="3.1"> + <function name="Color3usv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLushort *" count="3"/> <glx rop="13"/> </function> - <function name="Color4b" vectorequiv="Color4bv" deprecated="3.1"> + <function name="Color4b" vectorequiv="Color4bv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> <param name="alpha" type="GLbyte"/> </function> - <function name="Color4bv" deprecated="3.1"> + <function name="Color4bv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLbyte *" count="4"/> <glx rop="14"/> </function> - <function name="Color4d" vectorequiv="Color4dv" deprecated="3.1"> + <function name="Color4d" vectorequiv="Color4dv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> <param name="alpha" type="GLdouble"/> </function> - <function name="Color4dv" deprecated="3.1"> + <function name="Color4dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="15"/> </function> @@ -1290,31 +1299,31 @@ <glx rop="16"/> </function> - <function name="Color4i" vectorequiv="Color4iv" deprecated="3.1"> + <function name="Color4i" vectorequiv="Color4iv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> <param name="alpha" type="GLint"/> </function> - <function name="Color4iv" deprecated="3.1"> + <function name="Color4iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="4"/> <glx rop="17"/> </function> - <function name="Color4s" vectorequiv="Color4sv" deprecated="3.1"> + <function name="Color4s" vectorequiv="Color4sv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> <param name="alpha" type="GLshort"/> </function> - <function name="Color4sv" deprecated="3.1"> + <function name="Color4sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="4"/> <glx rop="18"/> </function> - <function name="Color4ub" vectorequiv="Color4ubv" es1="1.1" + <function name="Color4ub" vectorequiv="Color4ubv" es1="1.1" exec="dynamic" deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> @@ -1322,31 +1331,31 @@ <param name="alpha" type="GLubyte"/> </function> - <function name="Color4ubv" deprecated="3.1"> + <function name="Color4ubv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLubyte *" count="4"/> <glx rop="19"/> </function> - <function name="Color4ui" vectorequiv="Color4uiv" deprecated="3.1"> + <function name="Color4ui" vectorequiv="Color4uiv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> <param name="alpha" type="GLuint"/> </function> - <function name="Color4uiv" deprecated="3.1"> + <function name="Color4uiv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLuint *" count="4"/> <glx rop="20"/> </function> - <function name="Color4us" vectorequiv="Color4usv" deprecated="3.1"> + <function name="Color4us" vectorequiv="Color4usv" deprecated="3.1" exec="dynamic"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> <param name="alpha" type="GLushort"/> </function> - <function name="Color4usv" deprecated="3.1"> + <function name="Color4usv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLushort *" count="4"/> <glx rop="21"/> </function> @@ -1356,7 +1365,7 @@ <param name="flag" type="GLboolean"/> </function> - <function name="EdgeFlagv" deprecated="3.1"> + <function name="EdgeFlagv" deprecated="3.1" exec="dynamic"> <param name="flag" type="const GLboolean *" count="1"/> <glx rop="22"/> </function> @@ -1365,11 +1374,11 @@ <glx rop="23"/> </function> - <function name="Indexd" vectorequiv="Indexdv" deprecated="3.1"> + <function name="Indexd" vectorequiv="Indexdv" deprecated="3.1" exec="dynamic"> <param name="c" type="GLdouble"/> </function> - <function name="Indexdv" deprecated="3.1"> + <function name="Indexdv" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLdouble *" count="1"/> <glx rop="24"/> </function> @@ -1384,42 +1393,42 @@ <glx rop="25"/> </function> - <function name="Indexi" vectorequiv="Indexiv" deprecated="3.1"> + <function name="Indexi" vectorequiv="Indexiv" deprecated="3.1" exec="dynamic"> <param name="c" type="GLint"/> </function> - <function name="Indexiv" deprecated="3.1"> + <function name="Indexiv" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLint *" count="1"/> <glx rop="26"/> </function> - <function name="Indexs" vectorequiv="Indexsv" deprecated="3.1"> + <function name="Indexs" vectorequiv="Indexsv" deprecated="3.1" exec="dynamic"> <param name="c" type="GLshort"/> </function> - <function name="Indexsv" deprecated="3.1"> + <function name="Indexsv" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLshort *" count="1"/> <glx rop="27"/> </function> - <function name="Normal3b" vectorequiv="Normal3bv" deprecated="3.1"> + <function name="Normal3b" vectorequiv="Normal3bv" deprecated="3.1" exec="dynamic"> <param name="nx" type="GLbyte"/> <param name="ny" type="GLbyte"/> <param name="nz" type="GLbyte"/> </function> - <function name="Normal3bv" deprecated="3.1"> + <function name="Normal3bv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="28"/> </function> - <function name="Normal3d" vectorequiv="Normal3dv" deprecated="3.1"> + <function name="Normal3d" vectorequiv="Normal3dv" deprecated="3.1" exec="dynamic"> <param name="nx" type="GLdouble"/> <param name="ny" type="GLdouble"/> <param name="nz" type="GLdouble"/> </function> - <function name="Normal3dv" deprecated="3.1"> + <function name="Normal3dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="29"/> </function> @@ -1436,24 +1445,24 @@ <glx rop="30"/> </function> - <function name="Normal3i" vectorequiv="Normal3iv" deprecated="3.1"> + <function name="Normal3i" vectorequiv="Normal3iv" deprecated="3.1" exec="dynamic"> <param name="nx" type="GLint"/> <param name="ny" type="GLint"/> <param name="nz" type="GLint"/> </function> - <function name="Normal3iv" deprecated="3.1"> + <function name="Normal3iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="3"/> <glx rop="31"/> </function> - <function name="Normal3s" vectorequiv="Normal3sv" deprecated="3.1"> + <function name="Normal3s" vectorequiv="Normal3sv" deprecated="3.1" exec="dynamic"> <param name="nx" type="GLshort"/> <param name="ny" type="GLshort"/> <param name="nz" type="GLshort"/> </function> - <function name="Normal3sv" deprecated="3.1"> + <function name="Normal3sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="3"/> <glx rop="32"/> </function> @@ -1603,7 +1612,7 @@ <glx rop="45"/> </function> - <function name="Rectf" vectorequiv="Rectfv" deprecated="3.1" exec="dynamic"> + <function name="Rectf" vectorequiv="Rectfv" deprecated="3.1"> <param name="x1" type="GLfloat"/> <param name="y1" type="GLfloat"/> <param name="x2" type="GLfloat"/> @@ -1642,11 +1651,11 @@ <glx rop="48"/> </function> - <function name="TexCoord1d" vectorequiv="TexCoord1dv" deprecated="3.1"> + <function name="TexCoord1d" vectorequiv="TexCoord1dv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLdouble"/> </function> - <function name="TexCoord1dv" deprecated="3.1"> + <function name="TexCoord1dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="1"/> <glx rop="49"/> </function> @@ -1661,30 +1670,30 @@ <glx rop="50"/> </function> - <function name="TexCoord1i" vectorequiv="TexCoord1iv" deprecated="3.1"> + <function name="TexCoord1i" vectorequiv="TexCoord1iv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLint"/> </function> - <function name="TexCoord1iv" deprecated="3.1"> + <function name="TexCoord1iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="1"/> <glx rop="51"/> </function> - <function name="TexCoord1s" vectorequiv="TexCoord1sv" deprecated="3.1"> + <function name="TexCoord1s" vectorequiv="TexCoord1sv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLshort"/> </function> - <function name="TexCoord1sv" deprecated="3.1"> + <function name="TexCoord1sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="1"/> <glx rop="52"/> </function> - <function name="TexCoord2d" vectorequiv="TexCoord2dv" deprecated="3.1"> + <function name="TexCoord2d" vectorequiv="TexCoord2dv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="TexCoord2dv" deprecated="3.1"> + <function name="TexCoord2dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="53"/> </function> @@ -1700,33 +1709,33 @@ <glx rop="54"/> </function> - <function name="TexCoord2i" vectorequiv="TexCoord2iv" deprecated="3.1"> + <function name="TexCoord2i" vectorequiv="TexCoord2iv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="TexCoord2iv" deprecated="3.1"> + <function name="TexCoord2iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="2"/> <glx rop="55"/> </function> - <function name="TexCoord2s" vectorequiv="TexCoord2sv" deprecated="3.1"> + <function name="TexCoord2s" vectorequiv="TexCoord2sv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="TexCoord2sv" deprecated="3.1"> + <function name="TexCoord2sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="2"/> <glx rop="56"/> </function> - <function name="TexCoord3d" vectorequiv="TexCoord3dv" deprecated="3.1"> + <function name="TexCoord3d" vectorequiv="TexCoord3dv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="TexCoord3dv" deprecated="3.1"> + <function name="TexCoord3dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="57"/> </function> @@ -1743,36 +1752,36 @@ <glx rop="58"/> </function> - <function name="TexCoord3i" vectorequiv="TexCoord3iv" deprecated="3.1"> + <function name="TexCoord3i" vectorequiv="TexCoord3iv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="TexCoord3iv" deprecated="3.1"> + <function name="TexCoord3iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="3"/> <glx rop="59"/> </function> - <function name="TexCoord3s" vectorequiv="TexCoord3sv" deprecated="3.1"> + <function name="TexCoord3s" vectorequiv="TexCoord3sv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="TexCoord3sv" deprecated="3.1"> + <function name="TexCoord3sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="3"/> <glx rop="60"/> </function> - <function name="TexCoord4d" vectorequiv="TexCoord4dv" deprecated="3.1"> + <function name="TexCoord4d" vectorequiv="TexCoord4dv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> <param name="q" type="GLdouble"/> </function> - <function name="TexCoord4dv" deprecated="3.1"> + <function name="TexCoord4dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="61"/> </function> @@ -1790,36 +1799,36 @@ <glx rop="62"/> </function> - <function name="TexCoord4i" vectorequiv="TexCoord4iv" deprecated="3.1"> + <function name="TexCoord4i" vectorequiv="TexCoord4iv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> <param name="q" type="GLint"/> </function> - <function name="TexCoord4iv" deprecated="3.1"> + <function name="TexCoord4iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="4"/> <glx rop="63"/> </function> - <function name="TexCoord4s" vectorequiv="TexCoord4sv" deprecated="3.1"> + <function name="TexCoord4s" vectorequiv="TexCoord4sv" deprecated="3.1" exec="dynamic"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> <param name="q" type="GLshort"/> </function> - <function name="TexCoord4sv" deprecated="3.1"> + <function name="TexCoord4sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="4"/> <glx rop="64"/> </function> - <function name="Vertex2d" vectorequiv="Vertex2dv" deprecated="3.1"> + <function name="Vertex2d" vectorequiv="Vertex2dv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="Vertex2dv" deprecated="3.1"> + <function name="Vertex2dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="65"/> </function> @@ -1835,33 +1844,33 @@ <glx rop="66"/> </function> - <function name="Vertex2i" vectorequiv="Vertex2iv" deprecated="3.1"> + <function name="Vertex2i" vectorequiv="Vertex2iv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="Vertex2iv" deprecated="3.1"> + <function name="Vertex2iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="2"/> <glx rop="67"/> </function> - <function name="Vertex2s" vectorequiv="Vertex2sv" deprecated="3.1"> + <function name="Vertex2s" vectorequiv="Vertex2sv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="Vertex2sv" deprecated="3.1"> + <function name="Vertex2sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="2"/> <glx rop="68"/> </function> - <function name="Vertex3d" vectorequiv="Vertex3dv" deprecated="3.1"> + <function name="Vertex3d" vectorequiv="Vertex3dv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="Vertex3dv" deprecated="3.1"> + <function name="Vertex3dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="69"/> </function> @@ -1878,36 +1887,36 @@ <glx rop="70"/> </function> - <function name="Vertex3i" vectorequiv="Vertex3iv" deprecated="3.1"> + <function name="Vertex3i" vectorequiv="Vertex3iv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="Vertex3iv" deprecated="3.1"> + <function name="Vertex3iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="3"/> <glx rop="71"/> </function> - <function name="Vertex3s" vectorequiv="Vertex3sv" deprecated="3.1"> + <function name="Vertex3s" vectorequiv="Vertex3sv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="Vertex3sv" deprecated="3.1"> + <function name="Vertex3sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="3"/> <glx rop="72"/> </function> - <function name="Vertex4d" vectorequiv="Vertex4dv" deprecated="3.1"> + <function name="Vertex4d" vectorequiv="Vertex4dv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="Vertex4dv" deprecated="3.1"> + <function name="Vertex4dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="73"/> </function> @@ -1925,26 +1934,26 @@ <glx rop="74"/> </function> - <function name="Vertex4i" vectorequiv="Vertex4iv" deprecated="3.1"> + <function name="Vertex4i" vectorequiv="Vertex4iv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="Vertex4iv" deprecated="3.1"> + <function name="Vertex4iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="4"/> <glx rop="75"/> </function> - <function name="Vertex4s" vectorequiv="Vertex4sv" deprecated="3.1"> + <function name="Vertex4s" vectorequiv="Vertex4sv" deprecated="3.1" exec="dynamic"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="Vertex4sv" deprecated="3.1"> + <function name="Vertex4sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="4"/> <glx rop="76"/> </function> @@ -1974,7 +1983,8 @@ <function name="Fogfv" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_fog_enum_to_count(pname)"/> <glx rop="81"/> </function> @@ -1986,7 +1996,8 @@ <function name="Fogiv" deprecated="3.1"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_fog_enum_to_count(pname)"/> <glx rop="83"/> </function> @@ -2011,7 +2022,8 @@ <function name="Lightfv" es1="1.0" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_light_enum_to_count(pname)"/> <glx rop="87"/> </function> @@ -2025,7 +2037,8 @@ <function name="Lightiv" deprecated="3.1"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_light_enum_to_count(pname)"/> <glx rop="89"/> </function> @@ -2037,7 +2050,8 @@ <function name="LightModelfv" es1="1.0" deprecated="3.1"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_light_model_enum_to_count(pname)"/> <glx rop="91"/> </function> @@ -2049,7 +2063,8 @@ <function name="LightModeliv" deprecated="3.1"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_light_model_enum_to_count(pname)"/> <glx rop="93"/> </function> @@ -2064,7 +2079,7 @@ <glx rop="95"/> </function> - <function name="Materialf" es1="1.0" deprecated="3.1"> + <function name="Materialf" es1="1.0" deprecated="3.1" exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> @@ -2074,21 +2089,23 @@ <function name="Materialfv" es1="1.0" deprecated="3.1" exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_material_enum_to_count(pname)"/> <glx rop="97"/> </function> - <function name="Materiali" deprecated="3.1"> + <function name="Materiali" deprecated="3.1" exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="98"/> </function> - <function name="Materialiv" deprecated="3.1"> + <function name="Materialiv" deprecated="3.1" exec="dynamic"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_material_enum_to_count(pname)"/> <glx rop="99"/> </function> @@ -2103,7 +2120,8 @@ <glx rop="101"/> </function> - <function name="PolygonStipple" deprecated="3.1"> + <function name="PolygonStipple" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="mask" type="const GLubyte *" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP" img_target="0" img_pad_dimensions="false"/> <glx rop="102"/> </function> @@ -2131,7 +2149,8 @@ <function name="TexParameterfv" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_tex_param_enum_to_count(pname)"/> <glx rop="106"/> </function> @@ -2145,11 +2164,13 @@ <function name="TexParameteriv" es1="1.1" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_tex_param_enum_to_count(pname)"/> <glx rop="108"/> </function> - <function name="TexImage1D" no_error="true"> + <function name="TexImage1D" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -2161,7 +2182,8 @@ <glx rop="109" large="true"/> </function> - <function name="TexImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="TexImage2D" es1="1.0" es2="2.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -2184,7 +2206,8 @@ <function name="TexEnvfv" es1="1.0" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_texenv_enum_to_count(pname)"/> <glx rop="112"/> </function> @@ -2198,7 +2221,8 @@ <function name="TexEnviv" es1="1.1" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_texenv_enum_to_count(pname)"/> <glx rop="114"/> </function> @@ -2212,7 +2236,8 @@ <function name="TexGendv" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLdouble *" variable_param="pname"/> + <param name="params" type="const GLdouble *" variable_param="pname" + marshal_count="_mesa_texgen_enum_to_count(pname)"/> <glx rop="116"/> </function> @@ -2226,7 +2251,8 @@ <function name="TexGenfv" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_texgen_enum_to_count(pname)"/> <glx rop="118"/> </function> @@ -2240,7 +2266,8 @@ <function name="TexGeniv" deprecated="3.1"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_texgen_enum_to_count(pname)"/> <glx rop="120"/> </function> @@ -2356,12 +2383,14 @@ <glx rop="137"/> </function> - <function name="Disable" es1="1.0" es2="2.0"> + <function name="Disable" es1="1.0" es2="2.0" + marshal_call_after="_mesa_glthread_Disable(ctx, cap);"> <param name="cap" type="GLenum"/> <glx rop="138" handcode="client"/> </function> - <function name="Enable" es1="1.0" es2="2.0" marshal="custom"> + <function name="Enable" es1="1.0" es2="2.0" + marshal_call_after='_mesa_glthread_Enable(ctx, cap);'> <param name="cap" type="GLenum"/> <glx rop="139" handcode="client"/> </function> @@ -2370,22 +2399,24 @@ <glx sop="108" handcode="true"/> </function> - <!-- TODO: Flush is marshalled synchronously as a temporary hack - since we don't yet have a hook into SwapBuffers. - - NOTE: when we remove this hack, we'll still have to handle Flush - specially to ensure that it causes all previous commands to get - delivered to the server thread. + <!-- Shared contexts have to wait for glthread to finish execution after glFlush, + so that other contexts can see the effect of previous GL calls when glFlush returns. + This is harmless if the contexts run on different threads, because we only stall + 1 thread that's asynchronous anyway. It's worse when the contexts run on the same + thread, but that's not a good use of multiple contexts. --> - <function name="Flush" es1="1.0" es2="2.0" marshal="custom"> + <function name="Flush" es1="1.0" es2="2.0" + marshal_call_after="_mesa_glthread_flush_batch(ctx); if (ctx->Shared->RefCount > 1) _mesa_glthread_finish(ctx);"> <glx sop="142" handcode="true"/> </function> - <function name="PopAttrib" deprecated="3.1"> + <function name="PopAttrib" deprecated="3.1" + marshal_call_after="_mesa_glthread_PopAttrib(ctx);"> <glx rop="141"/> </function> - <function name="PushAttrib" deprecated="3.1"> + <function name="PushAttrib" deprecated="3.1" + marshal_call_after="_mesa_glthread_PushAttrib(ctx, mask);"> <param name="mask" type="GLbitfield"/> <glx rop="142"/> </function> @@ -2472,11 +2503,11 @@ <glx rop="150"/> </function> - <function name="EvalCoord1d" vectorequiv="EvalCoord1dv" deprecated="3.1"> + <function name="EvalCoord1d" vectorequiv="EvalCoord1dv" deprecated="3.1" exec="dynamic"> <param name="u" type="GLdouble"/> </function> - <function name="EvalCoord1dv" deprecated="3.1"> + <function name="EvalCoord1dv" deprecated="3.1" exec="dynamic"> <param name="u" type="const GLdouble *" count="1"/> <glx rop="151"/> </function> @@ -2486,17 +2517,17 @@ <param name="u" type="GLfloat"/> </function> - <function name="EvalCoord1fv" deprecated="3.1"> + <function name="EvalCoord1fv" deprecated="3.1" exec="dynamic"> <param name="u" type="const GLfloat *" count="1"/> <glx rop="152"/> </function> - <function name="EvalCoord2d" vectorequiv="EvalCoord2dv" deprecated="3.1"> + <function name="EvalCoord2d" vectorequiv="EvalCoord2dv" deprecated="3.1" exec="dynamic"> <param name="u" type="GLdouble"/> <param name="v" type="GLdouble"/> </function> - <function name="EvalCoord2dv" deprecated="3.1"> + <function name="EvalCoord2dv" deprecated="3.1" exec="dynamic"> <param name="u" type="const GLdouble *" count="2"/> <glx rop="153"/> </function> @@ -2507,12 +2538,12 @@ <param name="v" type="GLfloat"/> </function> - <function name="EvalCoord2fv" deprecated="3.1"> + <function name="EvalCoord2fv" deprecated="3.1" exec="dynamic"> <param name="u" type="const GLfloat *" count="2"/> <glx rop="154"/> </function> - <function name="EvalMesh1" deprecated="3.1" exec="dynamic"> + <function name="EvalMesh1" deprecated="3.1"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> @@ -2524,7 +2555,7 @@ <glx rop="156"/> </function> - <function name="EvalMesh2" deprecated="3.1" exec="dynamic"> + <function name="EvalMesh2" deprecated="3.1"> <param name="mode" type="GLenum"/> <param name="i1" type="GLint"/> <param name="i2" type="GLint"/> @@ -2605,21 +2636,24 @@ <glx sop="110" handcode="client"/> </function> - <function name="PixelMapfv" deprecated="3.1" marshal="sync"> + <function name="PixelMapfv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLfloat *" count="mapsize"/> <glx rop="168" large="true"/> </function> - <function name="PixelMapuiv" deprecated="3.1" marshal="sync"> + <function name="PixelMapuiv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLuint *" count="mapsize"/> <glx rop="169" large="true"/> </function> - <function name="PixelMapusv" deprecated="3.1" marshal="sync"> + <function name="PixelMapusv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="mapsize" type="GLsizei" counter="true"/> <param name="values" type="const GLushort *" count="mapsize"/> @@ -2640,7 +2674,8 @@ <glx rop="172"/> </function> - <function name="ReadPixels" es1="1.0" es2="2.0" no_error="true"> + <function name="ReadPixels" es1="1.0" es2="2.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="width" type="GLsizei"/> @@ -2651,7 +2686,8 @@ <glx sop="111"/> </function> - <function name="DrawPixels" deprecated="3.1"> + <function name="DrawPixels" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> @@ -2689,7 +2725,7 @@ <glx sop="116" handcode="client"/> </function> - <function name="GetIntegerv" es1="1.0" es2="2.0"> + <function name="GetIntegerv" es1="1.0" es2="2.0" marshal="custom"> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx sop="117" handcode="client"/> @@ -2744,25 +2780,29 @@ <glx sop="124"/> </function> - <function name="GetPixelMapfv" deprecated="3.1"> + <function name="GetPixelMapfv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="values" type="GLfloat *" output="true" variable_param="map"/> <glx sop="125"/> </function> - <function name="GetPixelMapuiv" deprecated="3.1"> + <function name="GetPixelMapuiv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="values" type="GLuint *" output="true" variable_param="map"/> <glx sop="126"/> </function> - <function name="GetPixelMapusv" deprecated="3.1"> + <function name="GetPixelMapusv" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="map" type="GLenum"/> <param name="values" type="GLushort *" output="true" variable_param="map"/> <glx sop="127"/> </function> - <function name="GetPolygonStipple" deprecated="3.1"> + <function name="GetPolygonStipple" deprecated="3.1" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="mask" type="GLubyte *" output="true" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/> <glx sop="128"/> </function> @@ -2808,7 +2848,8 @@ <glx sop="134"/> </function> - <function name="GetTexImage"> + <function name="GetTexImage" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="format" type="GLenum"/> @@ -2889,7 +2930,8 @@ <glx rop="178"/> </function> - <function name="MatrixMode" es1="1.0" deprecated="3.1"> + <function name="MatrixMode" es1="1.0" deprecated="3.1" + marshal_call_after="_mesa_glthread_MatrixMode(ctx, mode);"> <param name="mode" type="GLenum"/> <glx rop="179"/> </function> @@ -2914,11 +2956,13 @@ <glx rop="182"/> </function> - <function name="PopMatrix" es1="1.0" deprecated="3.1"> + <function name="PopMatrix" es1="1.0" deprecated="3.1" + marshal_call_after="_mesa_glthread_PopMatrix(ctx);"> <glx rop="183"/> </function> - <function name="PushMatrix" es1="1.0" deprecated="3.1"> + <function name="PushMatrix" es1="1.0" deprecated="3.1" + marshal_call_after="_mesa_glthread_PushMatrix(ctx);"> <glx rop="184"/> </function> @@ -3148,14 +3192,14 @@ <enum name="CLIENT_VERTEX_ARRAY_BIT" value="0x00000002"/> <enum name="CLIENT_ALL_ATTRIB_BITS" value="0xFFFFFFFF"/> - <function name="ArrayElement" deprecated="3.1" exec="dynamic" marshal="draw"> + <function name="ArrayElement" deprecated="3.1" exec="dynamic"> <param name="i" type="GLint"/> <glx handcode="true"/> </function> <function name="ColorPointer" es1="1.0" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_COLOR0, size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3163,20 +3207,20 @@ <glx handcode="true"/> </function> - <function name="DisableClientState" es1="1.0" deprecated="3.1"> + <function name="DisableClientState" es1="1.0" deprecated="3.1" + marshal_call_after="if (COMPAT) _mesa_glthread_ClientState(ctx, NULL, _mesa_array_to_attrib(ctx, array), false);"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> - <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"> + <function name="DrawArrays" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="first" type="GLint"/> <param name="count" type="GLsizei"/> <glx rop="193" handcode="true"/> </function> - <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawElements" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="count" type="GLsizei"/> <param name="type" type="GLenum"/> @@ -3186,13 +3230,14 @@ <function name="EdgeFlagPointer" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_EDGEFLAG, 1, GL_UNSIGNED_BYTE, stride, pointer);"> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="EnableClientState" es1="1.0" deprecated="3.1"> + <function name="EnableClientState" es1="1.0" deprecated="3.1" + marshal_call_after="if (COMPAT) _mesa_glthread_ClientState(ctx, NULL, _mesa_array_to_attrib(ctx, array), true);"> <param name="array" type="GLenum"/> <glx handcode="true"/> </function> @@ -3205,14 +3250,15 @@ <function name="IndexPointer" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_COLOR_INDEX, 1, type, stride, pointer);"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="InterleavedArrays" deprecated="3.1"> + <function name="InterleavedArrays" deprecated="3.1" marshal="async" + marshal_call_after="_mesa_glthread_InterleavedArrays(ctx, format, stride, pointer);"> <param name="format" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -3221,7 +3267,7 @@ <function name="NormalPointer" es1="1.0" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_NORMAL, 3, type, stride, pointer);"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -3230,7 +3276,7 @@ <function name="TexCoordPointer" es1="1.0" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_TEX(ctx->GLThread.ClientActiveTexture), size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3240,7 +3286,7 @@ <function name="VertexPointer" es1="1.0" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_POS, size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -3299,7 +3345,8 @@ <glx rop="4122"/> </function> - <function name="TexSubImage1D" no_error="true"> + <function name="TexSubImage1D" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3311,7 +3358,8 @@ <glx rop="4099" large="true"/> </function> - <function name="TexSubImage2D" es1="1.0" es2="2.0" no_error="true"> + <function name="TexSubImage2D" es1="1.0" es2="2.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -3364,20 +3412,22 @@ <glx rop="4118"/> </function> - <function name="Indexub" vectorequiv="Indexubv" deprecated="3.1"> + <function name="Indexub" vectorequiv="Indexubv" deprecated="3.1" exec="dynamic"> <param name="c" type="GLubyte"/> </function> - <function name="Indexubv" deprecated="3.1"> + <function name="Indexubv" deprecated="3.1" exec="dynamic"> <param name="c" type="const GLubyte *" count="1"/> <glx rop="194"/> </function> - <function name="PopClientAttrib" deprecated="3.1"> + <function name="PopClientAttrib" deprecated="3.1" + marshal_call_after="_mesa_glthread_PopClientAttrib(ctx);"> <glx handcode="true"/> </function> - <function name="PushClientAttrib" deprecated="3.1"> + <function name="PushClientAttrib" deprecated="3.1" + marshal_call_after="_mesa_glthread_PushClientAttrib(ctx, mask, false);"> <param name="mask" type="GLbitfield"/> <glx handcode="true"/> </function> @@ -3743,8 +3793,7 @@ <glx rop="4097"/> </function> - <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="DrawRangeElements" es2="3.0" marshal="custom"> <param name="mode" type="GLenum"/> <param name="start" type="GLuint"/> <param name="end" type="GLuint"/> @@ -4011,7 +4060,8 @@ <glx rop="4113"/> </function> - <function name="TexImage3D" es2="3.0" no_error="true"> + <function name="TexImage3D" es2="3.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLint"/> @@ -4025,7 +4075,8 @@ <glx rop="4114" large="true"/> </function> - <function name="TexSubImage3D" es2="3.0" no_error="true"> + <function name="TexSubImage3D" es2="3.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4268,22 +4319,24 @@ <enum name="DOT3_RGB" value="0x86AE"/> <enum name="DOT3_RGBA" value="0x86AF"/> - <function name="ActiveTexture" es1="1.0" es2="2.0" no_error="true"> + <function name="ActiveTexture" es1="1.0" es2="2.0" no_error="true" + marshal_call_after="ctx->GLThread.ActiveTexture = texture - GL_TEXTURE0; if (ctx->GLThread.MatrixMode == GL_TEXTURE) ctx->GLThread.MatrixIndex = _mesa_get_matrix_index(ctx, texture);"> <param name="texture" type="GLenum"/> <glx rop="197"/> </function> - <function name="ClientActiveTexture" es1="1.0" deprecated="3.1"> + <function name="ClientActiveTexture" es1="1.0" deprecated="3.1" + marshal_call_after="ctx->GLThread.ClientActiveTexture = texture - GL_TEXTURE0;"> <param name="texture" type="GLenum"/> <glx handcode="true"/> </function> - <function name="MultiTexCoord1d" deprecated="3.1"> + <function name="MultiTexCoord1d" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dv" deprecated="3.1"> + <function name="MultiTexCoord1dv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="198"/> @@ -4300,35 +4353,35 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord1i" deprecated="3.1"> + <function name="MultiTexCoord1i" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1iv" deprecated="3.1"> + <function name="MultiTexCoord1iv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="1"/> <glx rop="200"/> </function> - <function name="MultiTexCoord1s" deprecated="3.1"> + <function name="MultiTexCoord1s" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1sv" deprecated="3.1"> + <function name="MultiTexCoord1sv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="201"/> </function> - <function name="MultiTexCoord2d" deprecated="3.1"> + <function name="MultiTexCoord2d" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dv" deprecated="3.1"> + <function name="MultiTexCoord2dv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="202"/> @@ -4347,38 +4400,38 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord2i" deprecated="3.1"> + <function name="MultiTexCoord2i" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2iv" deprecated="3.1"> + <function name="MultiTexCoord2iv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="2"/> <glx rop="204"/> </function> - <function name="MultiTexCoord2s" deprecated="3.1"> + <function name="MultiTexCoord2s" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2sv" deprecated="3.1"> + <function name="MultiTexCoord2sv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="205"/> </function> - <function name="MultiTexCoord3d" deprecated="3.1"> + <function name="MultiTexCoord3d" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dv" deprecated="3.1"> + <function name="MultiTexCoord3dv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="206"/> @@ -4398,33 +4451,33 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord3i" deprecated="3.1"> + <function name="MultiTexCoord3i" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3iv" deprecated="3.1"> + <function name="MultiTexCoord3iv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="3"/> <glx rop="208"/> </function> - <function name="MultiTexCoord3s" deprecated="3.1"> + <function name="MultiTexCoord3s" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3sv" deprecated="3.1"> + <function name="MultiTexCoord3sv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="209"/> </function> - <function name="MultiTexCoord4d" deprecated="3.1"> + <function name="MultiTexCoord4d" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -4432,7 +4485,7 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dv" deprecated="3.1"> + <function name="MultiTexCoord4dv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="210"/> @@ -4453,7 +4506,7 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord4i" deprecated="3.1"> + <function name="MultiTexCoord4i" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -4461,13 +4514,13 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4iv" deprecated="3.1"> + <function name="MultiTexCoord4iv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLint *" count="4"/> <glx rop="212"/> </function> - <function name="MultiTexCoord4s" deprecated="3.1"> + <function name="MultiTexCoord4s" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -4475,29 +4528,29 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4sv" deprecated="3.1"> + <function name="MultiTexCoord4sv" deprecated="3.1" exec="dynamic"> <param name="target" type="GLenum"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="213"/> </function> <function name="LoadTransposeMatrixf" deprecated="3.1"> - <param name="m" type="const GLfloat *"/> + <param name="m" type="const GLfloat *" count="16"/> <glx handcode="true"/> </function> <function name="LoadTransposeMatrixd" deprecated="3.1"> - <param name="m" type="const GLdouble *"/> + <param name="m" type="const GLdouble *" count="16"/> <glx handcode="true"/> </function> <function name="MultTransposeMatrixf" deprecated="3.1"> - <param name="m" type="const GLfloat *"/> + <param name="m" type="const GLfloat *" count="16"/> <glx handcode="true"/> </function> <function name="MultTransposeMatrixd" deprecated="3.1"> - <param name="m" type="const GLdouble *"/> + <param name="m" type="const GLdouble *" count="16"/> <glx handcode="true"/> </function> @@ -4507,8 +4560,8 @@ <glx rop="229"/> </function> - <function name="CompressedTexImage3D" es2="3.0" marshal="sync" - no_error="true"> + <function name="CompressedTexImage3D" es2="3.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4521,8 +4574,8 @@ <glx rop="216" handcode="client"/> </function> - <function name="CompressedTexImage2D" es1="1.0" es2="2.0" marshal="sync" - no_error="true"> + <function name="CompressedTexImage2D" es1="1.0" es2="2.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4534,7 +4587,8 @@ <glx rop="215" handcode="client"/> </function> - <function name="CompressedTexImage1D" marshal="sync" no_error="true"> + <function name="CompressedTexImage1D" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4545,8 +4599,8 @@ <glx rop="214" handcode="client"/> </function> - <function name="CompressedTexSubImage3D" es2="3.0" marshal="sync" - no_error="true"> + <function name="CompressedTexSubImage3D" es2="3.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4561,8 +4615,8 @@ <glx rop="219" handcode="client"/> </function> - <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" marshal="sync" - no_error="true"> + <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4575,7 +4629,8 @@ <glx rop="218" handcode="client"/> </function> - <function name="CompressedTexSubImage1D" marshal="sync" no_error="true"> + <function name="CompressedTexSubImage1D" no_error="true" + marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4586,7 +4641,8 @@ <glx rop="217" handcode="client"/> </function> - <function name="GetCompressedTexImage"> + <function name="GetCompressedTexImage" + marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="img" type="GLvoid *" output="true"/> @@ -4725,28 +4781,28 @@ <param name="coord" type="const GLfloat *"/> </function> - <function name="FogCoordd" deprecated="3.1"> + <function name="FogCoordd" deprecated="3.1" exec="dynamic"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddv" deprecated="3.1"> + <function name="FogCoorddv" deprecated="3.1" exec="dynamic"> <param name="coord" type="const GLdouble *" count="1"/> <glx rop="4125"/> </function> <function name="FogCoordPointer" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_FOG, 1, type, stride, pointer);"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> <glx handcode="true"/> </function> - <function name="MultiDrawArrays" marshal="draw"> + <function name="MultiDrawArrays" marshal="custom"> <param name="mode" type="GLenum"/> - <param name="first" type="const GLint *"/> - <param name="count" type="const GLsizei *"/> + <param name="first" type="const GLint *" count="primcount"/> + <param name="count" type="const GLsizei *" count="primcount"/> <param name="primcount" type="GLsizei"/> <glx handcode="true"/> </function> @@ -4767,7 +4823,8 @@ <function name="PointParameterfv" es1="1.1"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> + <param name="params" type="const GLfloat *" variable_param="pname" + marshal_count="_mesa_point_param_enum_to_count(pname)"/> <glx rop="2066"/> </function> @@ -4779,28 +4836,29 @@ <function name="PointParameteriv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> + <param name="params" type="const GLint *" variable_param="pname" + marshal_count="_mesa_point_param_enum_to_count(pname)"/> <glx rop="4222"/> </function> - <function name="SecondaryColor3b" deprecated="3.1"> + <function name="SecondaryColor3b" deprecated="3.1" exec="dynamic"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bv" deprecated="3.1"> + <function name="SecondaryColor3bv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="4126"/> </function> - <function name="SecondaryColor3d" deprecated="3.1"> + <function name="SecondaryColor3d" deprecated="3.1" exec="dynamic"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dv" deprecated="3.1"> + <function name="SecondaryColor3dv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4130"/> </function> @@ -4817,64 +4875,64 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="SecondaryColor3i" deprecated="3.1"> + <function name="SecondaryColor3i" deprecated="3.1" exec="dynamic"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3iv" deprecated="3.1"> + <function name="SecondaryColor3iv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLint *" count="3"/> <glx rop="4128"/> </function> - <function name="SecondaryColor3s" deprecated="3.1"> + <function name="SecondaryColor3s" deprecated="3.1" exec="dynamic"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3sv" deprecated="3.1"> + <function name="SecondaryColor3sv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLshort *" count="3"/> <glx rop="4127"/> </function> - <function name="SecondaryColor3ub" deprecated="3.1"> + <function name="SecondaryColor3ub" deprecated="3.1" exec="dynamic"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubv" deprecated="3.1"> + <function name="SecondaryColor3ubv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="4131"/> </function> - <function name="SecondaryColor3ui" deprecated="3.1"> + <function name="SecondaryColor3ui" deprecated="3.1" exec="dynamic"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uiv" deprecated="3.1"> + <function name="SecondaryColor3uiv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLuint *" count="3"/> <glx rop="4133"/> </function> - <function name="SecondaryColor3us" deprecated="3.1"> + <function name="SecondaryColor3us" deprecated="3.1" exec="dynamic"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usv" deprecated="3.1"> + <function name="SecondaryColor3usv" deprecated="3.1" exec="dynamic"> <param name="v" type="const GLushort *" count="3"/> <glx rop="4132"/> </function> <function name="SecondaryColorPointer" deprecated="3.1" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_COLOR1, size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -4889,7 +4947,7 @@ </function> <function name="WindowPos2dv" deprecated="3.1"> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="2"/> <glx handcode="true"/> </function> @@ -4900,7 +4958,7 @@ </function> <function name="WindowPos2fv" deprecated="3.1"> - <param name="v" type="const GLfloat *"/> + <param name="v" type="const GLfloat *" count="2"/> <glx handcode="true"/> </function> @@ -4911,7 +4969,7 @@ </function> <function name="WindowPos2iv" deprecated="3.1"> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="2"/> <glx handcode="true"/> </function> @@ -4922,7 +4980,7 @@ </function> <function name="WindowPos2sv" deprecated="3.1"> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="2"/> <glx handcode="true"/> </function> @@ -4934,7 +4992,7 @@ </function> <function name="WindowPos3dv" deprecated="3.1"> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="3"/> <glx handcode="true"/> </function> @@ -4957,7 +5015,7 @@ </function> <function name="WindowPos3iv" deprecated="3.1"> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="3"/> <glx handcode="true"/> </function> @@ -4969,7 +5027,7 @@ </function> <function name="WindowPos3sv" deprecated="3.1"> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="3"/> <glx handcode="true"/> </function> </category> @@ -5039,7 +5097,8 @@ <type name="intptr" size="4" glx_name="CARD32"/> <type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBuffer" es1="1.1" es2="2.0" marshal="custom" no_error="true"> + <function name="BindBuffer" es1="1.1" es2="2.0" no_error="true" + marshal_call_after="if (COMPAT) _mesa_glthread_BindBuffer(ctx, target, buffer);"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> <glx ignore="true"/> @@ -5062,7 +5121,8 @@ <glx ignore="true"/> </function> - <function name="DeleteBuffers" es1="1.1" es2="2.0" no_error="true"> + <function name="DeleteBuffers" es1="1.1" es2="2.0" no_error="true" + marshal_call_after="if (COMPAT) _mesa_glthread_DeleteBuffers(ctx, n, buffer);"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="const GLuint *" count="n"/> <glx ignore="true"/> @@ -5109,7 +5169,7 @@ <glx ignore="true"/> </function> - <function name="UnmapBuffer" es2="3.0" no_error="true"> + <function name="UnmapBuffer" es2="3.0" no_error="true" marshal="async"> <param name="target" type="GLenum"/> <return type="GLboolean"/> <glx ignore="true"/> @@ -5304,7 +5364,7 @@ <function name="BindAttribLocation" es2="2.0" no_error="true"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> - <param name="name" type="const GLchar *"/> + <param name="name" type="const GLchar *" count="(strlen(name) + 1)"/> <glx ignore="true"/> </function> @@ -5324,7 +5384,8 @@ <glx ignore="true"/> </function> - <function name="DeleteProgram" es2="2.0"> + <function name="DeleteProgram" es2="2.0" + marshal_call_after="_mesa_glthread_ProgramChanged(ctx);"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> @@ -5340,13 +5401,15 @@ <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" es2="2.0" no_error="true"> + <function name="DisableVertexAttribArray" es2="2.0" no_error="true" + marshal_call_after="if (COMPAT) _mesa_glthread_ClientState(ctx, NULL, VERT_ATTRIB_GENERIC(index), false);"> <param name="index" type="GLuint"/> <glx ignore="true"/> <glx handcode="true"/> </function> - <function name="EnableVertexAttribArray" es2="2.0" no_error="true"> + <function name="EnableVertexAttribArray" es2="2.0" no_error="true" + marshal_call_after="if (COMPAT) _mesa_glthread_ClientState(ctx, NULL, VERT_ATTRIB_GENERIC(index), true);"> <param name="index" type="GLuint"/> <glx ignore="true"/> <glx handcode="true"/> @@ -5363,7 +5426,7 @@ <glx ignore="true"/> </function> - <function name="GetActiveUniform" es2="2.0"> + <function name="GetActiveUniform" es2="2.0" marshal="custom"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -5492,7 +5555,8 @@ <glx ignore="true"/> </function> - <function name="LinkProgram" es2="2.0" no_error="true"> + <function name="LinkProgram" es2="2.0" no_error="true" + marshal_call_after="_mesa_glthread_ProgramChanged(ctx);"> <param name="program" type="GLuint"/> <glx ignore="true"/> </function> @@ -5641,11 +5705,11 @@ <glx ignore="true"/> </function> - <function name="VertexAttrib1d"> + <function name="VertexAttrib1d" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dv"> + <function name="VertexAttrib1dv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4197" doubles_in_order="true"/> @@ -5658,22 +5722,22 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib1s"> + <function name="VertexAttrib1s" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1sv"> + <function name="VertexAttrib1sv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4189"/> </function> - <function name="VertexAttrib2d"> + <function name="VertexAttrib2d" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dv"> + <function name="VertexAttrib2dv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4198" doubles_in_order="true"/> @@ -5687,24 +5751,24 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib2s"> + <function name="VertexAttrib2s" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2sv"> + <function name="VertexAttrib2sv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4190"/> </function> - <function name="VertexAttrib3d"> + <function name="VertexAttrib3d" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dv"> + <function name="VertexAttrib3dv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4199" doubles_in_order="true"/> @@ -5719,68 +5783,68 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib3s"> + <function name="VertexAttrib3s" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3sv"> + <function name="VertexAttrib3sv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4191"/> </function> - <function name="VertexAttrib4Nbv"> + <function name="VertexAttrib4Nbv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4235"/> </function> - <function name="VertexAttrib4Niv"> + <function name="VertexAttrib4Niv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4237"/> </function> - <function name="VertexAttrib4Nsv"> + <function name="VertexAttrib4Nsv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4236"/> </function> - <function name="VertexAttrib4Nub"> + <function name="VertexAttrib4Nub" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> <param name="z" type="GLubyte"/> <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4Nubv"> + <function name="VertexAttrib4Nubv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4201"/> </function> - <function name="VertexAttrib4Nuiv"> + <function name="VertexAttrib4Nuiv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4239"/> </function> - <function name="VertexAttrib4Nusv"> + <function name="VertexAttrib4Nusv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4238"/> </function> - <function name="VertexAttrib4bv"> + <function name="VertexAttrib4bv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> <glx rop="4230"/> </function> - <function name="VertexAttrib4d"> + <function name="VertexAttrib4d" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dv"> + <function name="VertexAttrib4dv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4200" doubles_in_order="true"/> @@ -5796,34 +5860,34 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib4iv"> + <function name="VertexAttrib4iv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> <glx rop="4231"/> </function> - <function name="VertexAttrib4s"> + <function name="VertexAttrib4s" exec="dynamic"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4sv"> + <function name="VertexAttrib4sv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4192"/> </function> - <function name="VertexAttrib4ubv"> + <function name="VertexAttrib4ubv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4232"/> </function> - <function name="VertexAttrib4uiv"> + <function name="VertexAttrib4uiv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> <glx rop="4234"/> </function> - <function name="VertexAttrib4usv"> + <function name="VertexAttrib4usv" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> <glx rop="4233"/> @@ -5831,7 +5895,7 @@ <function name="VertexAttribPointer" es2="2.0" marshal="async" no_error="true" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_GENERIC(index), size, type, stride, pointer);"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -7670,7 +7734,8 @@ <type name="charARB" size="1" glx_name="CARD8"/> <type name="handleARB" size="4" glx_name="CARD32"/> - <function name="DeleteObjectARB"> + <function name="DeleteObjectARB" + marshal_call_after="_mesa_glthread_ProgramChanged(ctx);"> <param name="obj" type="GLhandleARB"/> <glx ignore="true"/> </function> @@ -8122,7 +8187,7 @@ <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> - <function name="DrawTransformFeedbackStream" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackStream"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -8170,13 +8235,13 @@ <xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <category name="GL_ARB_transform_feedback_instanced" number="109"> - <function name="DrawTransformFeedbackInstanced" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackInstanced"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="primcount" type="GLsizei"/> </function> - <function name="DrawTransformFeedbackStreamInstanced" exec="dynamic" marshal="draw"> + <function name="DrawTransformFeedbackStreamInstanced"> <param name="mode" type="GLenum"/> <param name="id" type="GLuint"/> <param name="stream" type="GLuint"/> @@ -9229,7 +9294,7 @@ </function> <function name="ColorPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_COLOR0, size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9245,7 +9310,7 @@ </function> <function name="EdgeFlagPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_EDGEFLAG, 1, GL_UNSIGNED_BYTE, stride, pointer);"> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> <param name="pointer" type="const GLboolean *"/> @@ -9258,7 +9323,7 @@ </function> <function name="IndexPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_COLOR_INDEX, 1, type, stride, pointer);"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -9267,7 +9332,7 @@ </function> <function name="NormalPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_NORMAL, 3, type, stride, pointer);"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="count" type="GLsizei"/> @@ -9276,7 +9341,7 @@ </function> <function name="TexCoordPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_TEX(ctx->GLThread.ClientActiveTexture), size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -9286,7 +9351,7 @@ </function> <function name="VertexPointerEXT" deprecated="3.1" marshal="async" - marshal_fail="_mesa_glthread_is_non_vbo_vertex_attrib_pointer(ctx)"> + marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx, VERT_ATTRIB_POS, size, type, stride, pointer);"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> @@ -10254,19 +10319,18 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" exec="dynamic" alias="MultiDrawArrays"> + <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> </function> - <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> + <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" marshal="custom"> <param name="mode" type="GLenum"/> - <param name="count" type="const GLsizei *"/> + <param name="count" type="const GLsizei *" count="primcount"/> <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid * const *"/> + <param name="indices" type="const GLvoid * const *" count="(sizeof(GLvoid *) * primcount)"/> <param name="primcount" type="GLsizei"/> <glx handcode="true"/> </function> @@ -10945,14 +11009,14 @@ <param name="target" type="GLenum"/> <param name="start" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="v" type="const GLfloat *"/> + <param name="v" type="const GLfloat *" count="(2 * count)"/> </function> <function name="NamedFramebufferSampleLocationsfvARB" no_error="true"> <param name="framebuffer" type="GLuint"/> <param name="start" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="v" type="const GLfloat *"/> + <param name="v" type="const GLfloat *" count="(2 * count)"/> </function> <function name="EvaluateDepthValuesARB"/> @@ -11324,7 +11388,7 @@ </function> <function name="WindowPos4dvMESA" deprecated="3.1"> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="4"/> <glx ignore="true"/> </function> @@ -11337,7 +11401,7 @@ </function> <function name="WindowPos4fvMESA" deprecated="3.1"> - <param name="v" type="const GLfloat *"/> + <param name="v" type="const GLfloat *" count="4"/> <glx ignore="true"/> </function> @@ -11350,7 +11414,7 @@ </function> <function name="WindowPos4ivMESA" deprecated="3.1"> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="4"/> <glx ignore="true"/> </function> @@ -11363,7 +11427,7 @@ </function> <function name="WindowPos4svMESA" deprecated="3.1"> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> <glx ignore="true"/> </function> </category> @@ -11376,21 +11440,22 @@ </category> <category name="GL_IBM_multimode_draw_arrays" number="200"> - <function name="MultiModeDrawArraysIBM" marshal="draw"> - <param name="mode" type="const GLenum *"/> - <param name="first" type="const GLint *"/> - <param name="count" type="const GLsizei *"/> + <function name="MultiModeDrawArraysIBM" + marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)"> + <param name="mode" type="const GLenum *" count="primcount"/> + <param name="first" type="const GLint *" count="primcount"/> + <param name="count" type="const GLsizei *" count="primcount"/> <param name="primcount" type="GLsizei"/> <param name="modestride" type="GLint"/> <glx handcode="true" ignore="true"/> </function> - <function name="MultiModeDrawElementsIBM" marshal="draw" - marshal_fail="_mesa_glthread_is_non_vbo_draw_elements(ctx)"> - <param name="mode" type="const GLenum *"/> - <param name="count" type="const GLsizei *"/> + <function name="MultiModeDrawElementsIBM" + marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)"> + <param name="mode" type="const GLenum *" count="primcount"/> + <param name="count" type="const GLsizei *" count="primcount"/> <param name="type" type="GLenum"/> - <param name="indices" type="const GLvoid * const *"/> + <param name="indices" type="const GLvoid * const *" count="(sizeof(GLvoid *) * primcount)"/> <param name="primcount" type="GLsizei"/> <param name="modestride" type="GLint"/> <glx handcode="true" ignore="true"/> @@ -11968,32 +12033,32 @@ <glx handcode="true"/> </function> - <function name="VertexAttrib1sNV" + <function name="VertexAttrib1sNV" exec="dynamic" vectorequiv="VertexAttrib1svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svNV" deprecated="3.1"> + <function name="VertexAttrib1svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4265"/> </function> - <function name="VertexAttrib2sNV" + <function name="VertexAttrib2sNV" exec="dynamic" vectorequiv="VertexAttrib2svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svNV" deprecated="3.1"> + <function name="VertexAttrib2svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4266"/> </function> - <function name="VertexAttrib3sNV" + <function name="VertexAttrib3sNV" exec="dynamic" vectorequiv="VertexAttrib3svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> @@ -12001,13 +12066,13 @@ <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svNV" deprecated="3.1"> + <function name="VertexAttrib3svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4267"/> </function> - <function name="VertexAttrib4sNV" + <function name="VertexAttrib4sNV" exec="dynamic" vectorequiv="VertexAttrib4svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> @@ -12016,7 +12081,7 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svNV" deprecated="3.1"> + <function name="VertexAttrib4svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4268"/> @@ -12076,32 +12141,32 @@ <glx rop="4272"/> </function> - <function name="VertexAttrib1dNV" + <function name="VertexAttrib1dNV" exec="dynamic" vectorequiv="VertexAttrib1dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvNV" deprecated="3.1"> + <function name="VertexAttrib1dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4273" doubles_in_order="true"/> </function> - <function name="VertexAttrib2dNV" + <function name="VertexAttrib2dNV" exec="dynamic" vectorequiv="VertexAttrib2dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvNV" deprecated="3.1"> + <function name="VertexAttrib2dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4274" doubles_in_order="true"/> </function> - <function name="VertexAttrib3dNV" + <function name="VertexAttrib3dNV" exec="dynamic" vectorequiv="VertexAttrib3dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -12109,13 +12174,13 @@ <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvNV" deprecated="3.1"> + <function name="VertexAttrib3dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4275" doubles_in_order="true"/> </function> - <function name="VertexAttrib4dNV" + <function name="VertexAttrib4dNV" exec="dynamic" vectorequiv="VertexAttrib4dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> @@ -12124,13 +12189,13 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvNV" deprecated="3.1"> + <function name="VertexAttrib4dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4276" doubles_in_order="true"/> </function> - <function name="VertexAttrib4ubNV" + <function name="VertexAttrib4ubNV" exec="dynamic" vectorequiv="VertexAttrib4ubvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> @@ -12139,97 +12204,97 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4ubvNV" deprecated="3.1"> + <function name="VertexAttrib4ubvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4277"/> </function> - <function name="VertexAttribs1svNV" deprecated="3.1"> + <function name="VertexAttribs1svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n"/> <glx rop="4202"/> </function> - <function name="VertexAttribs2svNV" deprecated="3.1"> + <function name="VertexAttribs2svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="2"/> <glx rop="4203"/> </function> - <function name="VertexAttribs3svNV" deprecated="3.1"> + <function name="VertexAttribs3svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="3"/> <glx rop="4204"/> </function> - <function name="VertexAttribs4svNV" deprecated="3.1"> + <function name="VertexAttribs4svNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="4"/> <glx rop="4205"/> </function> - <function name="VertexAttribs1fvNV" deprecated="3.1"> + <function name="VertexAttribs1fvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n"/> <glx rop="4206"/> </function> - <function name="VertexAttribs2fvNV" deprecated="3.1"> + <function name="VertexAttribs2fvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="4207"/> </function> - <function name="VertexAttribs3fvNV" deprecated="3.1"> + <function name="VertexAttribs3fvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="3"/> <glx rop="4208"/> </function> - <function name="VertexAttribs4fvNV" deprecated="3.1"> + <function name="VertexAttribs4fvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="4"/> <glx rop="4209"/> </function> - <function name="VertexAttribs1dvNV" deprecated="3.1"> + <function name="VertexAttribs1dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n"/> <glx rop="4210" doubles_in_order="true"/> </function> - <function name="VertexAttribs2dvNV" deprecated="3.1"> + <function name="VertexAttribs2dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/> <glx rop="4211" doubles_in_order="true"/> </function> - <function name="VertexAttribs3dvNV" deprecated="3.1"> + <function name="VertexAttribs3dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/> <glx rop="4212" doubles_in_order="true"/> </function> - <function name="VertexAttribs4dvNV" deprecated="3.1"> + <function name="VertexAttribs4dvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/> <glx rop="4213" doubles_in_order="true"/> </function> - <function name="VertexAttribs4ubvNV" deprecated="3.1"> + <function name="VertexAttribs4ubvNV" deprecated="3.1" exec="dynamic"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLubyte *" count="n" count_scale="4"/> @@ -12553,7 +12618,7 @@ <function name="SetFragmentShaderConstantATI" deprecated="3.1"> <param name="dst" type="GLuint"/> - <param name="value" type="const GLfloat *"/> + <param name="value" type="const GLfloat *" count="4"/> <glx ignore="true"/> </function> </category> @@ -12964,6 +13029,8 @@ <xi:include href="EXT_separate_shader_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="NV_copy_image.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="EXT_vertex_attrib_64bit.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="AMD_depth_clamp_separate.xml" @@ -13052,6 +13119,8 @@ <xi:include href="INTEL_performance_query.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="NV_alpha_to_coverage_dither_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <category name="GL_EXT_polygon_offset_clamp" number="460"> <enum name="POLYGON_OFFSET_CLAMP_EXT" value="0x8E1B"> <size name="Get" mode="get"/> @@ -13141,14 +13210,14 @@ <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="params" type="const GLfloat *"/> + <param name="params" type="const GLfloat *" count="4"/> </function> <function name="ProgramLocalParameters4fvEXT" deprecated="3.1"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="count" type="GLsizei"/> - <param name="params" type="const GLfloat *"/> + <param name="params" type="const GLfloat *" count="4"/> </function> </category> @@ -13259,6 +13328,24 @@ </function> </category> +<category name="GL_MESA_internal_functions"> + <!-- Internal function for glthread to implement BufferSubData as a GPU copy. --> + <function name="InternalBufferSubDataCopyMESA" es2="2.0"> + <param name="srcBuffer" type="GLintptr"/> <!-- "struct gl_buffer_object *" really --> + <param name="srcOffset" type="GLuint"/> + <param name="dstTargetOrName" type="GLuint"/> + <param name="dstOffset" type="GLintptr"/> + <param name="size" type="GLsizeiptr"/> + <param name="named" type="GLboolean"/> + <param name="ext_dsa" type="GLboolean"/> + </function> + + <!-- Set a GL error. Used by glthread to set errors without syncing. --> + <function name="InternalSetError" es2="2.0"> + <param name="error" type="GLenum"/> + </function> +</category> + <xi:include href="OES_EGL_image.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_EGL_image_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -13280,6 +13367,9 @@ <xi:include href="EXT_external_objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_external_objects_fd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="NV_viewport_swizzle.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + +<xi:include href="NV_half_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="GL4x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </OpenGLAPI> |