OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support to gl{Create,Gen}VertexArrays()

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset
2017-07-18 15:21:22 +02:00
parent ab0f246672
commit 6f4741e32e
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,7 +579,7 @@
<!-- Vertex Array object functions --> <!-- Vertex Array object functions -->
<function name="CreateVertexArrays"> <function name="CreateVertexArrays" no_error="true">
<param name="n" type="GLsizei" /> <param name="n" type="GLsizei" />
<param name="arrays" type="GLuint *" /> <param name="arrays" type="GLuint *" />
</function> </function>

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

@@ -20,7 +20,7 @@
<param name="arrays" type="const GLuint *" count="n"/> <param name="arrays" type="const GLuint *" count="n"/>
</function> </function>
<function name="GenVertexArrays" es2="3.0"> <function name="GenVertexArrays" es2="3.0" no_error="true">
<param name="n" type="GLsizei"/> <param name="n" type="GLsizei"/>
<param name="arrays" type="GLuint *"/> <param name="arrays" type="GLuint *"/>
</function> </function>

16
src/mesa/main/arrayobj.c
View File

@@ -550,6 +550,14 @@ gen_vertex_arrays_err(struct gl_context *ctx, GLsizei n, GLuint *arrays,
* ARB version of glGenVertexArrays() * ARB version of glGenVertexArrays()
* All arrays will be required to live in VBOs. * All arrays will be required to live in VBOs.
*/ */
void GLAPIENTRY
_mesa_GenVertexArrays_no_error(GLsizei n, GLuint *arrays)
{
GET_CURRENT_CONTEXT(ctx);
gen_vertex_arrays(ctx, n, arrays, false, "glGenVertexArrays");
}
void GLAPIENTRY void GLAPIENTRY
_mesa_GenVertexArrays(GLsizei n, GLuint *arrays) _mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
{ {
@@ -562,6 +570,14 @@ _mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
* ARB_direct_state_access * ARB_direct_state_access
* Generates ID's and creates the array objects. * Generates ID's and creates the array objects.
*/ */
void GLAPIENTRY
_mesa_CreateVertexArrays_no_error(GLsizei n, GLuint *arrays)
{
GET_CURRENT_CONTEXT(ctx);
gen_vertex_arrays(ctx, n, arrays, true, "glCreateVertexArrays");
}
void GLAPIENTRY void GLAPIENTRY
_mesa_CreateVertexArrays(GLsizei n, GLuint *arrays) _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays)
{ {

6
src/mesa/main/arrayobj.h
View File

@@ -98,8 +98,14 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids); void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
void GLAPIENTRY
_mesa_GenVertexArrays_no_error(GLsizei n, GLuint *arrays);
void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays); void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
void GLAPIENTRY
_mesa_CreateVertexArrays_no_error(GLsizei n, GLuint *arrays);
void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays); void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id ); GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );