summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texstorage.c
diff options
context:
space:
mode:
authorAlejandro PiƱeiro <[email protected]>2015-11-20 10:34:50 +0100
committerEduardo Lima Mitev <[email protected]>2016-03-03 15:14:06 +0100
commit95392cfa9d815ec985ba14dfe347b30d232ed9e7 (patch)
treeab7cae295d17e67d8f192ef821242d291ab0e026 /src/mesa/main/texstorage.c
parentaaf5ad513b790a2d0f97dd757ff69ea78c375529 (diff)
mesa/main: not fill mesa_error on _mesa_legal_texture_base_format_for_target
This would allow to use this method if you are just querying if it is allowed, like for arb_internalformat_query2. Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/main/texstorage.c')
-rw-r--r--src/mesa/main/texstorage.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 9fd969fbc53..f4a076028fb 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -358,11 +358,11 @@ tex_storage_error_check(struct gl_context *ctx,
}
/* additional checks for depth textures */
- if (!_mesa_legal_texture_base_format_for_target(ctx, target, internalformat,
- dims, dsa ?
- "glTextureStorage" :
- "glTexStorage"))
+ if (!_mesa_legal_texture_base_format_for_target(ctx, target, internalformat)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glTex%sStorage%uD(bad target for texture)",
+ suffix, dims);
return GL_TRUE;
+ }
return GL_FALSE;
}