diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 10:56:19 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 2a4d5dce74ab7138a8e124a28a9eac69a9d96e5d (patch) | |
| tree | 568fd856e76a4907b0f9454e3b4359bf92a18c97 /src | |
| parent | 68c43ae8b2026acca482639292b3a673fb06ef6f (diff) | |
mesa: add KHR_no_error support to glTextureView()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_texture_view.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/textureview.c | 18 | ||||
| -rw-r--r-- | src/mesa/main/textureview.h | 6 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_texture_view.xml b/src/mapi/glapi/gen/ARB_texture_view.xml index 4215fc5bd54..0c20ef97d89 100644 --- a/src/mapi/glapi/gen/ARB_texture_view.xml +++ b/src/mapi/glapi/gen/ARB_texture_view.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_texture_view" number="124"> - <function name="TextureView"> + <function name="TextureView" no_error="true"> <param name="texture" type="GLuint"/> <param name="target" type="GLenum"/> <param name="origtexture" type="GLuint"/> diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 165af3c7469..89af068fae8 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -697,6 +697,24 @@ texture_view(struct gl_context *ctx, struct gl_texture_object *origTexObj, } void GLAPIENTRY +_mesa_TextureView_no_error(GLuint texture, GLenum target, GLuint origtexture, + GLenum internalformat, + GLuint minlevel, GLuint numlevels, + GLuint minlayer, GLuint numlayers) +{ + struct gl_texture_object *texObj; + struct gl_texture_object *origTexObj; + + GET_CURRENT_CONTEXT(ctx); + + origTexObj = _mesa_lookup_texture(ctx, origtexture); + texObj = _mesa_lookup_texture(ctx, texture); + + texture_view(ctx, origTexObj, texObj, target, internalformat, minlevel, + numlevels, minlayer, numlayers, true); +} + +void GLAPIENTRY _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, diff --git a/src/mesa/main/textureview.h b/src/mesa/main/textureview.h index 39b415d8793..e2f18aed017 100644 --- a/src/mesa/main/textureview.h +++ b/src/mesa/main/textureview.h @@ -42,6 +42,12 @@ GLenum _mesa_texture_view_lookup_view_class(const struct gl_context *ctx, GLenum internalformat); +void GLAPIENTRY +_mesa_TextureView_no_error(GLuint texture, GLenum target, GLuint origtexture, + GLenum internalformat, + GLuint minlevel, GLuint numlevels, + GLuint minlayer, GLuint numlayers); + extern void GLAPIENTRY _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, |