From c06480390b68c7118b0628f0a2702e6a8c67e1e0 Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Tue, 18 Oct 2016 09:55:38 +0200 Subject: [PATCH] drivers/meta: Accept GL_TEXTURE_3D as target for tex image decompression An assert is currently raised, preventing decompression of a texture image into a GL_TEXTURE_3D target. I have not found any spec wording that would explain this, or implementation detail that would prevent it. And in any case, the driver should not cause a crash upon user input arguments. Fixes most failing subcases in CTS tests: * GL44-CTS.gtf32.GL3Tests.packed_pixels.packed_pixels_pixelstore * GL45-CTS.gtf32.GL3Tests.packed_pixels.packed_pixels_pixelstore These tests were crashing the driver before. Now they just fail, but due to an unrelated issue affecting 2 out of the 45 test subcases. No regressions observed against piglit or CTS-GL. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/common/meta.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 7d131b6ccfa..5ab1e6ca285 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3026,10 +3026,6 @@ decompress_texture_image(struct gl_context *ctx, assert(!"No compressed 1D textures."); return false; - case GL_TEXTURE_3D: - assert(!"No compressed 3D textures."); - return false; - case GL_TEXTURE_CUBE_MAP_ARRAY: faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + (slice % 6); break; -- 2.30.2