diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2015-07-17 18:01:01 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2015-07-18 02:35:24 +0200 |
| commit | e42cfe5d032e97e0444df39421a9f93f84452d68 (patch) | |
| tree | a5e47d3fc53d4e4365898716eb49268b0a2e819c /src/mesa/main/texstorage.c | |
| parent | 27aa31fab40783356207ba5dabd839b430496e7b (diff) | |
| download | external_mesa3d-e42cfe5d032e97e0444df39421a9f93f84452d68.zip external_mesa3d-e42cfe5d032e97e0444df39421a9f93f84452d68.tar.gz external_mesa3d-e42cfe5d032e97e0444df39421a9f93f84452d68.tar.bz2 | |
mesa: fix up some texture error checks
In particular, we were incorrectly accepting s3tc (and lots of others)
for CompressedTexSubImage3D (but not CompressedTexImage3D) calls with 3d
targets. At this time, the only allowed formats for these calls are the
bptc ones, since none of the specific extensions allow it (astc hdr would).
Also, fix up a bug in _mesa_target_can_be_compressed - 3d target needs to
be allowed for bptc formats.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/texstorage.c')
| -rw-r--r-- | src/mesa/main/texstorage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 53cb2c0..aa8fa3e 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -309,6 +309,7 @@ tex_storage_error_check(struct gl_context *ctx, GL_INVALID_ENUM : GL_INVALID_OPERATION, "glTex%sStorage%dD(internalformat = %s)", suffix, dims, _mesa_lookup_enum_by_nr(internalformat)); + return GL_TRUE; } /* levels check */ |