Mesa (master): mesa: add EXT_dsa glVertexArray* functions declarations
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 5 13:52:07 UTC 2019
Module: Mesa
Branch: master
Commit: a26bb93943c8071c75615d1d4ebc4e66ee56c0c3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a26bb93943c8071c75615d1d4ebc4e66ee56c0c3
Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date: Fri Oct 25 11:06:21 2019 +0200
mesa: add EXT_dsa glVertexArray* functions declarations
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/mapi/glapi/gen/EXT_direct_state_access.xml | 98 ++++++++++++++++++++++++++
src/mapi/glapi/gen/static_data.py | 11 +++
src/mesa/main/tests/dispatch_sanity.cpp | 22 +++---
src/mesa/main/varray.c | 90 +++++++++++++++++++++++
src/mesa/main/varray.h | 47 ++++++++++++
5 files changed, 257 insertions(+), 11 deletions(-)
diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml
index 336f3ad5289..19f9048f84a 100644
--- a/src/mapi/glapi/gen/EXT_direct_state_access.xml
+++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml
@@ -1052,6 +1052,104 @@
<param name="size" type="GLsizeiptr" />
</function>
+ <function name="VertexArrayVertexOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayColorOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayEdgeFlagOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayIndexOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayNormalOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayTexCoordOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayMultiTexCoordOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="texunit" type="GLenum" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayFogCoordOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArraySecondaryColorOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayVertexAttribOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="index" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="normalized" type="GLboolean" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
+ <function name="VertexArrayVertexAttribIOffsetEXT">
+ <param name="vaobj" type="GLuint" />
+ <param name="buffer" type="GLuint" />
+ <param name="index" type="GLuint" />
+ <param name="size" type="GLint" />
+ <param name="type" type="GLenum" />
+ <param name="stride" type="GLsizei" />
+ <param name="offset" type="GLintptr" />
+ </function>
+
<!-- ARB_vertex_program -->
<function name="NamedProgramStringEXT">
<param name="program" type="GLuint" />
diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index 01bc6ed95ea..43011be402d 100644
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1597,6 +1597,17 @@ offsets = {
"GenerateMultiTexMipmapEXT": 1561,
"NamedRenderbufferStorageMultisampleEXT": 1562,
"NamedCopyBufferSubDataEXT": 1563,
+ "VertexArrayVertexOffsetEXT": 1564,
+ "VertexArrayColorOffsetEXT": 1565,
+ "VertexArrayEdgeFlagOffsetEXT": 1566,
+ "VertexArrayIndexOffsetEXT": 1567,
+ "VertexArrayNormalOffsetEXT": 1568,
+ "VertexArrayTexCoordOffsetEXT": 1569,
+ "VertexArrayMultiTexCoordOffsetEXT": 1570,
+ "VertexArrayFogCoordOffsetEXT": 1571,
+ "VertexArraySecondaryColorOffsetEXT": 1572,
+ "VertexArrayVertexAttribOffsetEXT": 1573,
+ "VertexArrayVertexAttribIOffsetEXT": 1574,
}
functions = [
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 3c501ce4a33..78a50532c5c 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -1169,17 +1169,17 @@ const struct function common_desktop_functions_possible[] = {
{ "glFramebufferReadBufferEXT", 30, -1 },
{ "glGetFramebufferParameterivEXT", 30, -1 },
{ "glNamedCopyBufferSubDataEXT", 30, -1 },
- //{ "glVertexArrayVertexOffsetEXT", 30, -1 },
- //{ "glVertexArrayColorOffsetEXT", 30, -1 },
- //{ "glVertexArrayEdgeFlagOffsetEXT", 30, -1 },
- //{ "glVertexArrayIndexOffsetEXT", 30, -1 },
- //{ "glVertexArrayNormalOffsetEXT", 30, -1 },
- //{ "glVertexArrayTexCoordOffsetEXT", 30, -1 },
- //{ "glVertexArrayMultiTexCoordOffsetEXT", 30, -1 },
- //{ "glVertexArrayFogCoordOffsetEXT", 30, -1 },
- //{ "glVertexArraySecondColorOffsetEXT", 30, -1 },
- //{ "glVertexArrayVertexAttribOffsetEXT", 30, -1 },
- //{ "glVertexArrayVertexAttribIOffsetEXT", 30, -1 },
+ { "glVertexArrayVertexOffsetEXT", 30, -1 },
+ { "glVertexArrayColorOffsetEXT", 30, -1 },
+ { "glVertexArrayEdgeFlagOffsetEXT", 30, -1 },
+ { "glVertexArrayIndexOffsetEXT", 30, -1 },
+ { "glVertexArrayNormalOffsetEXT", 30, -1 },
+ { "glVertexArrayTexCoordOffsetEXT", 30, -1 },
+ { "glVertexArrayMultiTexCoordOffsetEXT", 30, -1 },
+ { "glVertexArrayFogCoordOffsetEXT", 30, -1 },
+ { "glVertexArraySecondaryColorOffsetEXT", 30, -1 },
+ { "glVertexArrayVertexAttribOffsetEXT", 30, -1 },
+ { "glVertexArrayVertexAttribIOffsetEXT", 30, -1 },
//{ "glEnableVertexArrayEXT", 30, -1 },
//{ "glDisableVertexArrayEXT", 30, -1 },
//{ "glEnableVertexArrayAttribEXT", 30, -1 },
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 643f6b6dfcb..dd54be979d4 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -664,6 +664,14 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
+_mesa_VertexArrayVertexOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_NormalPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr )
{
GET_CURRENT_CONTEXT(ctx);
@@ -701,6 +709,14 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
void GLAPIENTRY
+_mesa_VertexArrayNormalOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_ColorPointer_no_error(GLint size, GLenum type, GLsizei stride,
const GLvoid *ptr)
{
@@ -743,6 +759,14 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
+_mesa_VertexArrayColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_FogCoordPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -775,6 +799,14 @@ _mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
+_mesa_VertexArrayFogCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_IndexPointer_no_error(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@@ -808,6 +840,14 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
+_mesa_VertexArrayIndexOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_SecondaryColorPointer_no_error(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
@@ -848,6 +888,14 @@ _mesa_SecondaryColorPointer(GLint size, GLenum type,
void GLAPIENTRY
+_mesa_VertexArraySecondaryColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_TexCoordPointer_no_error(GLint size, GLenum type, GLsizei stride,
const GLvoid *ptr)
{
@@ -890,6 +938,23 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
void GLAPIENTRY
+_mesa_VertexArrayTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
+_mesa_VertexArrayMultiTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum texunit,
+ GLint size, GLenum type, GLsizei stride,
+ GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_EdgeFlagPointer_no_error(GLsizei stride, const GLvoid *ptr)
{
/* this is the same type that glEdgeFlag uses */
@@ -926,6 +991,14 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
+_mesa_VertexArrayEdgeFlagOffsetEXT(GLuint vaobj, GLuint buffer, GLsizei stride,
+ GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_PointSizePointerOES_no_error(GLenum type, GLsizei stride,
const GLvoid *ptr)
{
@@ -1019,6 +1092,15 @@ _mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
void GLAPIENTRY
+_mesa_VertexArrayVertexAttribOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
+ GLenum type, GLboolean normalized,
+ GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_VertexAttribIPointer_no_error(GLuint index, GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
@@ -1082,6 +1164,14 @@ _mesa_VertexAttribLPointer_no_error(GLuint index, GLint size, GLenum type,
void GLAPIENTRY
+_mesa_VertexArrayVertexAttribIOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset)
+{
+
+}
+
+
+void GLAPIENTRY
_mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 1d1ce515271..89fc6690330 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -444,4 +444,51 @@ _mesa_init_varray(struct gl_context *ctx);
extern void
_mesa_free_varray_data(struct gl_context *ctx);
+extern void GLAPIENTRY
+_mesa_VertexArrayVertexOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayEdgeFlagOffsetEXT(GLuint vaobj, GLuint buffer, GLsizei stride,
+ GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayIndexOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayNormalOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayMultiTexCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum texunit,
+ GLint size, GLenum type, GLsizei stride,
+ GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayFogCoordOffsetEXT(GLuint vaobj, GLuint buffer, GLenum type,
+ GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArraySecondaryColorOffsetEXT(GLuint vaobj, GLuint buffer, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayVertexAttribOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
+ GLenum type, GLboolean normalized,
+ GLsizei stride, GLintptr offset);
+
+extern void GLAPIENTRY
+_mesa_VertexArrayVertexAttribIOffsetEXT(GLuint vaobj, GLuint buffer, GLuint index, GLint size,
+ GLenum type, GLsizei stride, GLintptr offset);
+
+
#endif
More information about the mesa-commit
mailing list