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

glthread: don't execute any custom VAO and BindBuffer code in the Core profile 

It's not needed, because user pointers can never occur there.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4251>
This commit is contained in:
Marek Olšák 2020-03-04 15:02:15 -05:00 committed by Marge Bot
parent 87f6be4456
commit 951c6acb07
9 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_direct_state_access.xml
View File

@ -580,7 +580,7 @@
<!-- Vertex Array object functions -->
<function name="CreateVertexArrays" no_error="true"
marshal_call_after="_mesa_glthread_GenVertexArrays(ctx, n, arrays);">
marshal_call_after="if (COMPAT) _mesa_glthread_GenVertexArrays(ctx, n, arrays);">
<param name="n" type="GLsizei" />
<param name="arrays" type="GLuint *" />
</function>

6
src/mapi/glapi/gen/ARB_vertex_array_object.xml
View File

@ -11,18 +11,18 @@
<enum name="VERTEX_ARRAY_BINDING" value="0x85B5"/>
<function name="BindVertexArray" es2="3.0" no_error="true"
marshal_call_after="_mesa_glthread_BindVertexArray(ctx, array);">
marshal_call_after="if (COMPAT) _mesa_glthread_BindVertexArray(ctx, array);">
<param name="array" type="GLuint"/>
</function>
<function name="DeleteVertexArrays" es2="3.0" no_error="true"
marshal_call_after="_mesa_glthread_DeleteVertexArrays(ctx, n, arrays);">
marshal_call_after="if (COMPAT) _mesa_glthread_DeleteVertexArrays(ctx, n, arrays);">
<param name="n" type="GLsizei"/>
<param name="arrays" type="const GLuint *" count="n"/>
</function>
<function name="GenVertexArrays" es2="3.0" no_error="true"
marshal_call_after="_mesa_glthread_GenVertexArrays(ctx, n, arrays);">
marshal_call_after="if (COMPAT) _mesa_glthread_GenVertexArrays(ctx, n, arrays);">
<param name="n" type="GLsizei"/>
<param name="arrays" type="GLuint *"/>
</function>

2
src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
View File

@ -52,7 +52,7 @@
</function>
<function name="VertexAttribLPointer" no_error="true" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="index" type="GLuint"/>
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>

2
src/mapi/glapi/gen/EXT_direct_state_access.xml
View File

@ -658,7 +658,7 @@
</function>
<function name="MultiTexCoordPointerEXT" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="texunit" type="GLenum" />
<param name="size" type="GLint" />
<param name="type" type="GLenum" />

2
src/mapi/glapi/gen/GL3x.xml
View File

@ -258,7 +258,7 @@
<function name="VertexAttribIPointer" es2="3.0" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="index" type="GLuint"/>
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>

2
src/mapi/glapi/gen/es_EXT.xml
View File

@ -320,7 +320,7 @@
<function name="PointSizePointerOES" es1="1.0" desktop="false"
no_error="true" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>

32
src/mapi/glapi/gen/gl_API.xml
View File

@ -3166,7 +3166,7 @@
<function name="ColorPointer" es1="1.0" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -3198,7 +3198,7 @@
<function name="EdgeFlagPointer" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
<glx handcode="true"/>
@ -3217,7 +3217,7 @@
<function name="IndexPointer" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
@ -3233,7 +3233,7 @@
<function name="NormalPointer" es1="1.0" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
@ -3242,7 +3242,7 @@
<function name="TexCoordPointer" es1="1.0" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -3252,7 +3252,7 @@
<function name="VertexPointer" es1="1.0" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -4748,7 +4748,7 @@
<function name="FogCoordPointer" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
@ -4889,7 +4889,7 @@
<function name="SecondaryColorPointer" deprecated="3.1" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -5055,7 +5055,7 @@
<type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/>
<function name="BindBuffer" es1="1.1" es2="2.0" no_error="true"
marshal_call_after="_mesa_glthread_BindBuffer(ctx, target, buffer);">
marshal_call_after="if (COMPAT) _mesa_glthread_BindBuffer(ctx, target, buffer);">
<param name="target" type="GLenum"/>
<param name="buffer" type="GLuint"/>
<glx ignore="true"/>
@ -5847,7 +5847,7 @@
<function name="VertexAttribPointer" es2="2.0" marshal="async"
no_error="true"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="index" type="GLuint"/>
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
@ -9245,7 +9245,7 @@
</function>
<function name="ColorPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -9261,7 +9261,7 @@
</function>
<function name="EdgeFlagPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="stride" type="GLsizei"/>
<param name="count" type="GLsizei"/>
<param name="pointer" type="const GLboolean *"/>
@ -9274,7 +9274,7 @@
</function>
<function name="IndexPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="count" type="GLsizei"/>
@ -9283,7 +9283,7 @@
</function>
<function name="NormalPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="count" type="GLsizei"/>
@ -9292,7 +9292,7 @@
</function>
<function name="TexCoordPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
@ -9302,7 +9302,7 @@
</function>
<function name="VertexPointerEXT" deprecated="3.1" marshal="async"
marshal_call_after="_mesa_glthread_AttribPointer(ctx);">
marshal_call_after="if (COMPAT) _mesa_glthread_AttribPointer(ctx);">
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>

2
src/mapi/glapi/gen/gl_marshal.py
View File

@ -35,6 +35,8 @@ header = """
#include "dispatch.h"
#include "glthread.h"
#include "marshal.h"
#define COMPAT (ctx->API != API_OPENGL_CORE)
"""

2
src/mesa/main/glthread_varray.c
View File

@ -139,6 +139,6 @@ _mesa_glthread_AttribPointer(struct gl_context *ctx)
{
struct glthread_state *glthread = ctx->GLThread;
if (ctx->API != API_OPENGL_CORE && !glthread->vertex_array_is_vbo)
if (!glthread->vertex_array_is_vbo)
glthread->CurrentVAO->HasUserPointer = true;
}