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

mesa: add KHR_no_error support for glBindFragDataLocation*() 

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri 2017-06-28 14:46:06 +10:00
parent aed0fc5efd
commit 87bc32166a
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
<category name="GL_ARB_blend_func_extended" number="78">
<function name="BindFragDataLocationIndexed">
<function name="BindFragDataLocationIndexed" no_error="true">
<param name="program" type="GLuint"/>
<param name="colorNumber" type="GLuint"/>
<param name="index" type="GLuint"/>

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

@ -200,7 +200,7 @@
<return type="GLint"/>
</function>
<function name="BindFragDataLocation">
<function name="BindFragDataLocation" no_error="true">
<param name="program" type="GLuint"/>
<param name="colorNumber" type="GLuint"/>
<param name="name" type="const GLchar *"/>

30
src/mesa/main/shader_query.cpp
View File

@ -279,6 +279,21 @@ _mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,
_mesa_BindFragDataLocationIndexed(program, colorNumber, 0, name);
}
void GLAPIENTRY
_mesa_BindFragDataLocation_no_error(GLuint program, GLuint colorNumber,
const GLchar *name)
{
GET_CURRENT_CONTEXT(ctx);
if (!name)
return;
struct gl_shader_program *const shProg =
_mesa_lookup_shader_program(ctx, program);
bind_frag_data_location(shProg, name, colorNumber, 0);
}
void GLAPIENTRY
_mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name)
@ -316,6 +331,21 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
bind_frag_data_location(shProg, name, colorNumber, index);
}
void GLAPIENTRY
_mesa_BindFragDataLocationIndexed_no_error(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name)
{
GET_CURRENT_CONTEXT(ctx);
if (!name)
return;
struct gl_shader_program *const shProg =
_mesa_lookup_shader_program(ctx, program);
bind_frag_data_location(shProg, name, colorNumber, index);
}
GLint GLAPIENTRY
_mesa_GetFragDataIndex(GLuint program, const GLchar *name)
{

8
src/mesa/main/shaderapi.h
View File

@ -157,6 +157,14 @@ extern void GLAPIENTRY
_mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name);
extern void GLAPIENTRY
_mesa_BindFragDataLocation_no_error(GLuint program, GLuint colorNumber,
const GLchar *name);
extern void GLAPIENTRY
_mesa_BindFragDataLocationIndexed_no_error(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name);
extern void GLAPIENTRY
_mesa_GetActiveAttrib(GLuint, GLuint, GLsizei, GLsizei *, GLint *,
GLenum *, GLchar *);