diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-19 11:05:31 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 9f1fab9533a84d35e7121ecc551b206af87f0f85 (patch) | |
| tree | ea6a0c2eeb2a24f28ac03c92977f0e1f60f78643 /src | |
| parent | cba013d423da97df486f77586f135345a50f1af6 (diff) | |
mesa: add KHR_no_error support to glBindTexture()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/texobj.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index fc863be87af..95c448d2364 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -3333,7 +3333,7 @@ <glx sop="143" handcode="client" always_array="true"/> </function> - <function name="BindTexture" es1="1.0" es2="2.0"> + <function name="BindTexture" es1="1.0" es2="2.0" no_error="true"> <param name="target" type="GLenum"/> <param name="texture" type="GLuint"/> <glx rop="4117"/> diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 04f320cbcdd..bf48d7595da 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1703,6 +1703,14 @@ bind_texture(struct gl_context *ctx, GLenum target, GLuint texName, void GLAPIENTRY +_mesa_BindTexture_no_error(GLenum target, GLuint texName) +{ + GET_CURRENT_CONTEXT(ctx); + bind_texture(ctx, target, texName, true); +} + + +void GLAPIENTRY _mesa_BindTexture(GLenum target, GLuint texName) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 9b9e4185d7b..4971a2075d8 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -193,6 +193,9 @@ extern void GLAPIENTRY _mesa_DeleteTextures( GLsizei n, const GLuint *textures ); +void GLAPIENTRY +_mesa_BindTexture_no_error(GLenum target, GLuint texture); + extern void GLAPIENTRY _mesa_BindTexture( GLenum target, GLuint texture ); |