diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2015-05-10 20:52:49 +0200 |
|---|---|---|
| committer | Fredrik Höglund <fredrik@kde.org> | 2015-05-14 15:48:17 +0200 |
| commit | 8940957238e8584ce27295791cee4cc3d6f7cf1e (patch) | |
| tree | 2388c2993714941ed80a31031a6e2bdb6bf47756 /src/mesa/main/texobj.c | |
| parent | cb49940766b581c6656473d89c221653c69fa0f9 (diff) | |
| download | external_mesa3d-8940957238e8584ce27295791cee4cc3d6f7cf1e.zip external_mesa3d-8940957238e8584ce27295791cee4cc3d6f7cf1e.tar.gz external_mesa3d-8940957238e8584ce27295791cee4cc3d6f7cf1e.tar.bz2 | |
mesa: Add ARB_direct_state_access checks in texture functions
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index c563f1e..d51e695 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1317,6 +1317,13 @@ _mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures) GLint targetIndex; GET_CURRENT_CONTEXT(ctx); + if (!ctx->Extensions.ARB_direct_state_access) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glCreateTextures(GL_ARB_direct_state_access " + "is not supported)"); + return; + } + /* * The 4.5 core profile spec (30.10.2014) doesn't specify what * glCreateTextures should do with invalid targets, which was probably an @@ -1808,6 +1815,13 @@ _mesa_BindTextureUnit(GLuint unit, GLuint texture) _mesa_debug(ctx, "glBindTextureUnit %s %d\n", _mesa_lookup_enum_by_nr(GL_TEXTURE0+unit), (GLint) texture); + if (!ctx->Extensions.ARB_direct_state_access) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBindTextureUnit(GL_ARB_direct_state_access " + "is not supported)"); + return; + } + /* Section 8.1 (Texture Objects) of the OpenGL 4.5 core profile spec * (20141030) says: * "When texture is zero, each of the targets enumerated at the |