AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glapi: rename 'vtxfmt' to 'beginend' to make it clear

Browse Source 
These are really just the functions that execute between Begin/End.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18828>
This commit is contained in:
Marek Olšák
2022-08-12 04:58:14 -04:00
committed by Marge Bot
parent 684dae9e64
commit 3c621f8a2a
17 changed files with 388 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mapi/glapi/gen/ARB_bindless_texture.xml
+2 -2
View File
@@ -79,12 +79,12 @@
<param name="handle" type="GLuint64" />
</function>
<function name="VertexAttribL1ui64ARB" exec="vtxfmt">
<function name="VertexAttribL1ui64ARB" exec="beginend">
<param name="index" type="GLuint" />
<param name="x" type="GLuint64EXT" />
</function>
<function name="VertexAttribL1ui64vARB" exec="vtxfmt">
<function name="VertexAttribL1ui64vARB" exec="beginend">
<param name="index" type="GLuint" />
<param name="v" type="const GLuint64EXT *" count="1"/>
</function>
src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
+8 -8
View File
@@ -5,25 +5,25 @@
<category name="GL_ARB_vertex_attrib_64bit" number="99">
<function name="VertexAttribL1d" exec="vtxfmt">
<function name="VertexAttribL1d" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLdouble"/>
</function>
<function name="VertexAttribL2d" exec="vtxfmt">
<function name="VertexAttribL2d" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLdouble"/>
<param name="y" type="GLdouble"/>
</function>
<function name="VertexAttribL3d" exec="vtxfmt">
<function name="VertexAttribL3d" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLdouble"/>
<param name="y" type="GLdouble"/>
<param name="z" type="GLdouble"/>
</function>
<function name="VertexAttribL4d" exec="vtxfmt">
<function name="VertexAttribL4d" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLdouble"/>
<param name="y" type="GLdouble"/>
@@ -31,22 +31,22 @@
<param name="w" type="GLdouble"/>
</function>
<function name="VertexAttribL1dv" exec="vtxfmt">
<function name="VertexAttribL1dv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLdouble *" count="1"/>
</function>
<function name="VertexAttribL2dv" exec="vtxfmt">
<function name="VertexAttribL2dv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLdouble *" count="2"/>
</function>
<function name="VertexAttribL3dv" exec="vtxfmt">
<function name="VertexAttribL3dv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLdouble *" count="3"/>
</function>
<function name="VertexAttribL4dv" exec="vtxfmt">
<function name="VertexAttribL4dv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLdouble *" count="4"/>
</function>
src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
+38 -38
View File
@@ -7,214 +7,214 @@
<enum name="INT_2_10_10_10_REV" value = "0x8D9F"/>
<function name="VertexP2ui" deprecated="3.1" exec="vtxfmt">
<function name="VertexP2ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexP3ui" deprecated="3.1" exec="vtxfmt">
<function name="VertexP3ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexP4ui" deprecated="3.1" exec="vtxfmt">
<function name="VertexP4ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexP2uiv" deprecated="3.1" exec="vtxfmt">
<function name="VertexP2uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="VertexP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="VertexP3uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="VertexP4uiv" deprecated="3.1" exec="vtxfmt">
<function name="VertexP4uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="TexCoordP1ui" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP1ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="TexCoordP2ui" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP2ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="TexCoordP3ui" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP3ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="TexCoordP4ui" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP4ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="TexCoordP1uiv" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP1uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="TexCoordP2uiv" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP2uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="TexCoordP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP3uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="TexCoordP4uiv" deprecated="3.1" exec="vtxfmt">
<function name="TexCoordP4uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="MultiTexCoordP1ui" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP1ui" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="MultiTexCoordP2ui" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP2ui" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="MultiTexCoordP3ui" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP3ui" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="MultiTexCoordP4ui" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP4ui" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="MultiTexCoordP1uiv" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP1uiv" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="MultiTexCoordP2uiv" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP2uiv" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="MultiTexCoordP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP3uiv" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="MultiTexCoordP4uiv" deprecated="3.1" exec="vtxfmt">
<function name="MultiTexCoordP4uiv" deprecated="3.1" exec="beginend">
<param name="texture" type="GLenum"/>
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="NormalP3ui" deprecated="3.1" exec="vtxfmt">
<function name="NormalP3ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="GLuint"/>
</function>
<function name="NormalP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="NormalP3uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="coords" type="const GLuint *" count="1"/>
</function>
<function name="ColorP3ui" deprecated="3.1" exec="vtxfmt">
<function name="ColorP3ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
<function name="ColorP4ui" deprecated="3.1" exec="vtxfmt">
<function name="ColorP4ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
<function name="ColorP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="ColorP3uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *" count="1"/>
</function>
<function name="ColorP4uiv" deprecated="3.1" exec="vtxfmt">
<function name="ColorP4uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *" count="1"/>
</function>
<function name="SecondaryColorP3ui" deprecated="3.1" exec="vtxfmt">
<function name="SecondaryColorP3ui" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="GLuint"/>
</function>
<function name="SecondaryColorP3uiv" deprecated="3.1" exec="vtxfmt">
<function name="SecondaryColorP3uiv" deprecated="3.1" exec="beginend">
<param name="type" type="GLenum"/>
<param name="color" type="const GLuint *" count="1"/>
</function>
<function name="VertexAttribP1ui" exec="vtxfmt">
<function name="VertexAttribP1ui" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexAttribP2ui" exec="vtxfmt">
<function name="VertexAttribP2ui" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexAttribP3ui" exec="vtxfmt">
<function name="VertexAttribP3ui" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexAttribP4ui" exec="vtxfmt">
<function name="VertexAttribP4ui" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="GLuint"/>
</function>
<function name="VertexAttribP1uiv" exec="vtxfmt">
<function name="VertexAttribP1uiv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="VertexAttribP2uiv" exec="vtxfmt">
<function name="VertexAttribP2uiv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="VertexAttribP3uiv" exec="vtxfmt">
<function name="VertexAttribP3uiv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
<param name="value" type="const GLuint *" count="1"/>
</function>
<function name="VertexAttribP4uiv" exec="vtxfmt">
<function name="VertexAttribP4uiv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="type" type="GLenum"/>
<param name="normalized" type="GLboolean"/>
src/mapi/glapi/gen/EXT_gpu_shader4.xml
+14 -14
View File
@@ -40,25 +40,25 @@
</enum>
<function name="VertexAttribI1iEXT" exec="vtxfmt">
<function name="VertexAttribI1iEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLint"/>
</function>
<function name="VertexAttribI2iEXT" exec="vtxfmt">
<function name="VertexAttribI2iEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLint"/>
<param name="y" type="GLint"/>
</function>
<function name="VertexAttribI3iEXT" exec="vtxfmt">
<function name="VertexAttribI3iEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLint"/>
<param name="y" type="GLint"/>
<param name="z" type="GLint"/>
</function>
<function name="VertexAttribI4iEXT" exec="vtxfmt">
<function name="VertexAttribI4iEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLint"/>
<param name="y" type="GLint"/>
@@ -66,25 +66,25 @@
<param name="w" type="GLint"/>
</function>
<function name="VertexAttribI1uiEXT" exec="vtxfmt">
<function name="VertexAttribI1uiEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLuint"/>
</function>
<function name="VertexAttribI2uiEXT" exec="vtxfmt">
<function name="VertexAttribI2uiEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
</function>
<function name="VertexAttribI3uiEXT" exec="vtxfmt">
<function name="VertexAttribI3uiEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
<param name="z" type="GLuint"/>
</function>
<function name="VertexAttribI4uiEXT" exec="vtxfmt">
<function name="VertexAttribI4uiEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
@@ -97,17 +97,17 @@
<param name="v" type="const GLint *"/>
</function>
<function name="VertexAttribI2ivEXT" exec="vtxfmt">
<function name="VertexAttribI2ivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *" count="2"/>
</function>
<function name="VertexAttribI3ivEXT" exec="vtxfmt">
<function name="VertexAttribI3ivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *" count="3"/>
</function>
<function name="VertexAttribI4ivEXT" exec="vtxfmt">
<function name="VertexAttribI4ivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *" count="4"/>
</function>
@@ -117,17 +117,17 @@
<param name="v" type="const GLuint *"/>
</function>
<function name="VertexAttribI2uivEXT" exec="vtxfmt">
<function name="VertexAttribI2uivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *" count="2"/>
</function>
<function name="VertexAttribI3uivEXT" exec="vtxfmt">
<function name="VertexAttribI3uivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *" count="3"/>
</function>
<function name="VertexAttribI4uivEXT" exec="vtxfmt">
<function name="VertexAttribI4uivEXT" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *" count="4"/>
</function>
src/mapi/glapi/gen/GL3x.xml
+6 -6
View File
@@ -330,7 +330,7 @@
<param name="w" type="GLuint"/>
</function>
<function name="VertexAttribI1iv" exec="vtxfmt">
<function name="VertexAttribI1iv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *" count="1"/>
</function>
@@ -350,7 +350,7 @@
<param name="v" type="const GLint *"/>
</function>
<function name="VertexAttribI1uiv" exec="vtxfmt">
<function name="VertexAttribI1uiv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *" count="1"/>
</function>
@@ -370,22 +370,22 @@
<param name="v" type="const GLuint *"/>
</function>
<function name="VertexAttribI4bv" exec="vtxfmt">
<function name="VertexAttribI4bv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLbyte *" count="4"/>
</function>
<function name="VertexAttribI4sv" exec="vtxfmt">
<function name="VertexAttribI4sv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLshort *" count="4"/>
</function>
<function name="VertexAttribI4ubv" exec="vtxfmt">
<function name="VertexAttribI4ubv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLubyte *" count="4"/>
</function>
<function name="VertexAttribI4usv" exec="vtxfmt">
<function name="VertexAttribI4usv" exec="beginend">
<param name="index" type="GLuint"/>
<param name="v" type="const GLushort *" count="4"/>
</function>
src/mapi/glapi/gen/NV_half_float.xml
+44 -44
View File
@@ -5,139 +5,139 @@
<category name="GL_NV_half_float" number="283">
<function name="Vertex2hNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex2hNV" exec="beginend" deprecated="3.1">
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
</function>
<function name="Vertex2hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex2hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="2"/>
</function>
<function name="Vertex3hNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex3hNV" exec="beginend" deprecated="3.1">
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
<param name="z" type="GLhalfNV"/>
</function>
<function name="Vertex3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex3hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="Vertex4hNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex4hNV" exec="beginend" deprecated="3.1">
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
<param name="z" type="GLhalfNV"/>
<param name="w" type="GLhalfNV"/>
</function>
<function name="Vertex4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Vertex4hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="4"/>
</function>
<function name="Normal3hNV" exec="vtxfmt" deprecated="3.1">
<function name="Normal3hNV" exec="beginend" deprecated="3.1">
<param name="nx" type="GLhalfNV"/>
<param name="ny" type="GLhalfNV"/>
<param name="nz" type="GLhalfNV"/>
</function>
<function name="Normal3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Normal3hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="Color3hNV" exec="vtxfmt" deprecated="3.1">
<function name="Color3hNV" exec="beginend" deprecated="3.1">
<param name="red" type="GLhalfNV"/>
<param name="green" type="GLhalfNV"/>
<param name="blue" type="GLhalfNV"/>
</function>
<function name="Color3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Color3hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="Color4hNV" exec="vtxfmt" deprecated="3.1">
<function name="Color4hNV" exec="beginend" deprecated="3.1">
<param name="red" type="GLhalfNV"/>
<param name="green" type="GLhalfNV"/>
<param name="blue" type="GLhalfNV"/>
<param name="alpha" type="GLhalfNV"/>
</function>
<function name="Color4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="Color4hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="4"/>
</function>
<function name="TexCoord1hNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord1hNV" exec="beginend" deprecated="3.1">
<param name="s" type="GLhalfNV"/>
</function>
<function name="TexCoord1hvNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord1hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="1"/>
</function>
<function name="TexCoord2hNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord2hNV" exec="beginend" deprecated="3.1">
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
</function>
<function name="TexCoord2hvNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord2hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="2"/>
</function>
<function name="TexCoord3hNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord3hNV" exec="beginend" deprecated="3.1">
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
<param name="r" type="GLhalfNV"/>
</function>
<function name="TexCoord3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord3hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="TexCoord4hNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord4hNV" exec="beginend" deprecated="3.1">
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
<param name="r" type="GLhalfNV"/>
<param name="q" type="GLhalfNV"/>
</function>
<function name="TexCoord4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="TexCoord4hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="4"/>
</function>
<function name="MultiTexCoord1hNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord1hNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="s" type="GLhalfNV"/>
</function>
<function name="MultiTexCoord1hvNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord1hvNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="v" type="const GLhalfNV *" count="1"/>
</function>
<function name="MultiTexCoord2hNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord2hNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
</function>
<function name="MultiTexCoord2hvNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord2hvNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="v" type="const GLhalfNV *" count="2"/>
</function>
<function name="MultiTexCoord3hNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord3hNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
<param name="r" type="GLhalfNV"/>
</function>
<function name="MultiTexCoord3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord3hvNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="MultiTexCoord4hNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord4hNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="s" type="GLhalfNV"/>
<param name="t" type="GLhalfNV"/>
@@ -145,45 +145,45 @@
<param name="q" type="GLhalfNV"/>
</function>
<function name="MultiTexCoord4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="MultiTexCoord4hvNV" exec="beginend" deprecated="3.1">
<param name="target" type="GLenum"/>
<param name="v" type="const GLhalfNV *" count="4"/>
</function>
<function name="VertexAttrib1hNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib1hNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="x" type="GLhalfNV"/>
</function>
<function name="VertexAttrib1hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib1hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="v" type="const GLhalfNV *" count="1"/>
</function>
<function name="VertexAttrib2hNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib2hNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
</function>
<function name="VertexAttrib2hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib2hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="v" type="const GLhalfNV *" count="2"/>
</function>
<function name="VertexAttrib3hNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib3hNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
<param name="z" type="GLhalfNV"/>
</function>
<function name="VertexAttrib3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib3hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
<function name="VertexAttrib4hNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib4hNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="x" type="GLhalfNV"/>
<param name="y" type="GLhalfNV"/>
@@ -191,50 +191,50 @@
<param name="w" type="GLhalfNV"/>
</function>
<function name="VertexAttrib4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttrib4hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="v" type="const GLhalfNV *" count="4"/>
</function>
<function name="VertexAttribs1hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttribs1hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="n" type="GLsizei"/>
<param name="v" type="const GLhalfNV *" count="n"/>
</function>
<function name="VertexAttribs2hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttribs2hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="n" type="GLsizei"/>
<param name="v" type="const GLhalfNV *" count="n" count_scale="2"/>
</function>
<function name="VertexAttribs3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttribs3hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="n" type="GLsizei"/>
<param name="v" type="const GLhalfNV *" count="n" count_scale="3"/>
</function>
<function name="VertexAttribs4hvNV" exec="vtxfmt" deprecated="3.1">
<function name="VertexAttribs4hvNV" exec="beginend" deprecated="3.1">
<param name="index" type="GLuint"/>
<param name="n" type="GLsizei"/>
<param name="v" type="const GLhalfNV *" count="n" count_scale="4"/>
</function>
<function name="FogCoordhNV" exec="vtxfmt" deprecated="3.1">
<function name="FogCoordhNV" exec="beginend" deprecated="3.1">
<param name="x" type="GLhalfNV"/>
</function>
<function name="FogCoordhvNV" exec="vtxfmt" deprecated="3.1">
<function name="FogCoordhvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="1"/>
</function>
<function name="SecondaryColor3hNV" exec="vtxfmt" deprecated="3.1">
<function name="SecondaryColor3hNV" exec="beginend" deprecated="3.1">
<param name="red" type="GLhalfNV"/>
<param name="green" type="GLhalfNV"/>
<param name="blue" type="GLhalfNV"/>
</function>
<function name="SecondaryColor3hvNV" exec="vtxfmt" deprecated="3.1">
<function name="SecondaryColor3hvNV" exec="beginend" deprecated="3.1">
<param name="v" type="const GLhalfNV *" count="3"/>
</function>
src/mapi/glapi/gen/NV_primitive_restart.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<enum name="PRIMITIVE_RESTART_NV" value="0x8558"/>
<enum name="PRIMITIVE_RESTART_INDEX_NV" value="0x8559"/>
<function name="PrimitiveRestartNV" deprecated="3.1" exec="vtxfmt"/>
<function name="PrimitiveRestartNV" deprecated="3.1" exec="beginend"/>
<function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex">
<param name="index" type="GLuint"/>
src/mapi/glapi/gen/api_vtxfmt_init_h.py → src/mapi/glapi/gen/api_beginend_init_h.py
+3 -3
View File
@@ -20,7 +20,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
# This script generates the file api_vtxfmt_init.h.
# This script generates the file api_beginend_init.h.
import argparse
import collections
@@ -35,7 +35,7 @@ class PrintCode(gl_XML.gl_print_base):
def __init__(self):
super().__init__()
self.name = 'api_vtxfmt_init_h.py'
self.name = 'api_beginend_init_h.py'
self.license = license.bsd_license_template % (
'Copyright (C) 2012 Intel Corporation\n'
'Copyright (C) 2021 Advanced Micro Devices, Inc.',
@@ -47,7 +47,7 @@ class PrintCode(gl_XML.gl_print_base):
settings_by_condition = collections.defaultdict(lambda: [])
for f in api.functionIterateAll():
if f.exec_flavor != 'vtxfmt':
if f.exec_flavor != 'beginend':
continue
condition = apiexec.get_api_condition(f)
src/mapi/glapi/gen/api_exec_init.py
+2 -2
View File
@@ -33,7 +33,7 @@ import apiexec
exec_flavor_map = {
'vtxfmt': None,
'beginend': None,
'dlist': '_mesa_',
'mesa': '_mesa_',
'skip': None,
@@ -105,7 +105,7 @@ class PrintCode(gl_XML.gl_print_base):
prefix = exec_flavor_map[f.exec_flavor]
if prefix is None:
# This function is not implemented, or is dispatched
# via vtxfmt.
# via beginend.
continue
if f.has_no_error_variant:
no_error_condition = '_mesa_is_no_error_enabled(ctx) && ({0})'.format(condition)
src/mapi/glapi/gen/api_hw_select_init_h.py
+1 -1
View File
@@ -43,7 +43,7 @@ class PrintCode(gl_XML.gl_print_base):
def printBody(self, api):
for f in api.functionIterateAll():
if f.exec_flavor != 'vtxfmt':
if f.exec_flavor != 'beginend':
continue
if (re.match('Vertex*', f.name)):
src/mapi/glapi/gen/gl_API.xml
+256 -256
View File
File diff suppressed because it is too large Load Diff
src/mapi/glapi/gen/meson.build
+4 -4
View File
@@ -253,10 +253,10 @@ main_api_save_h = custom_target(
capture : true,
)
main_api_vtxfmt_init_h = custom_target(
'api_vtxfmt_init.h',
input : ['api_vtxfmt_init_h.py', 'gl_and_es_API.xml'],
output : 'api_vtxfmt_init.h',
main_api_beginend_init_h = custom_target(
'api_beginend_init.h',
input : ['api_beginend_init_h.py', 'gl_and_es_API.xml'],
output : 'api_beginend_init.h',
command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
depend_files : files('apiexec.py') + glapi_gen_depends,
capture : true,
src/mesa/main/dlist.c
+1 -1
View File
@@ -14104,5 +14104,5 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx)
#define NAME(x) save_##x
#define NAME_ES(x) save_##x
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}
src/mesa/meson.build
+1 -1
View File
@@ -447,7 +447,7 @@ files_libmesa += [
main_api_exec_decl_h,
main_api_save_h,
main_api_save_init_h,
main_api_vtxfmt_init_h,
main_api_beginend_init_h,
main_api_hw_select_init_h,
main_enums_c,
format_fallback_c,
src/mesa/vbo/vbo_exec_api.c
+2 -2
View File
@@ -1077,11 +1077,11 @@ vbo_install_exec_vtxfmt(struct gl_context *ctx)
#define NAME_ES(x) _es_##x
struct _glapi_table *tab = ctx->OutsideBeginEnd;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
if (ctx->BeginEnd) {
tab = ctx->BeginEnd;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}
}
src/mesa/vbo/vbo_noop.c
+4 -4
View File
@@ -128,16 +128,16 @@ vbo_install_exec_vtxfmt_noop(struct gl_context *ctx)
#define NAME_ES(x) _mesa_noop_##x
struct _glapi_table *tab = ctx->Exec;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
if (ctx->BeginEnd) {
tab = ctx->BeginEnd;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}
if (ctx->HWSelectModeBeginEnd) {
tab = ctx->HWSelectModeBeginEnd;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}
}
@@ -146,7 +146,7 @@ void
vbo_install_save_vtxfmt_noop(struct gl_context *ctx)
{
struct _glapi_table *tab = ctx->Save;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}
/**
src/mesa/vbo/vbo_save_api.c
+1 -1
View File
@@ -1943,7 +1943,7 @@ vbo_install_save_vtxfmt(struct gl_context *ctx)
#define NAME_ES(x) _save_##x
struct _glapi_table *tab = ctx->Save;
#include "api_vtxfmt_init.h"
#include "api_beginend_init.h"
}