diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-20 11:26:42 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-08-02 12:54:31 +0200 |
| commit | fcd8ab6e866b96e6601fdc04c72a74c782b31454 (patch) | |
| tree | 7c5fc96a8e39762dfdbecfdcbe9f4882e86fec29 | |
| parent | 29f84556ca5fef7b752edf1eaa161a7d35f3fcf6 (diff) | |
mesa: add KHR_no_error support to glShaderSource()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.h | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e1b3c43fb19..7afcc5db65d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -5497,7 +5497,7 @@ <glx ignore="true"/> </function> - <function name="ShaderSource" es2="2.0" marshal="custom"> + <function name="ShaderSource" es2="2.0" marshal="custom" no_error="true"> <param name="shader" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLchar * const *"/> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 941419b6f17..55398131824 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1904,6 +1904,15 @@ shader_source(struct gl_context *ctx, GLuint shaderObj, GLsizei count, void GLAPIENTRY +_mesa_ShaderSource_no_error(GLuint shaderObj, GLsizei count, + const GLchar *const *string, const GLint *length) +{ + GET_CURRENT_CONTEXT(ctx); + shader_source(ctx, shaderObj, count, string, length, true); +} + + +void GLAPIENTRY _mesa_ShaderSource(GLuint shaderObj, GLsizei count, const GLchar *const *string, const GLint *length) { diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index e4c3bd2e76e..b76e57ee39d 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -134,6 +134,10 @@ _mesa_IsShader(GLuint name); extern void GLAPIENTRY _mesa_LinkProgram(GLuint programObj); +void GLAPIENTRY +_mesa_ShaderSource_no_error(GLuint, GLsizei, const GLchar* const *, + const GLint *); + extern void GLAPIENTRY _mesa_ShaderSource(GLuint, GLsizei, const GLchar* const *, const GLint *); |