From 26808cbb23f6440559d853d333265ef651423694 Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Fri, 4 Sep 2015 20:20:28 +0300 Subject: dbg: texsubimage simplified Signed-off-by: Topi Pohjolainen --- tests/texturing/texsubimage.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index 5d38736da..e9e481e87 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -60,6 +60,7 @@ static const struct test_desc texsubimage_test_sets[] = { "Core formats", GL_UNSIGNED_NORMALIZED, }, +#if 0 { tdfx_texture_compression_fxt1, ARRAY_SIZE(tdfx_texture_compression_fxt1), @@ -90,6 +91,7 @@ static const struct test_desc texsubimage_test_sets[] = { GL_UNSIGNED_NORMALIZED, {"GL_EXT_texture_compression_latc"} } +#endif }; /* Default texture size. Other values might be used if the texture has @@ -415,6 +417,9 @@ test_format(GLenum target, GLenum intFormat) hMask = ~(bh-1); dMask = ~0; + if (intFormat != GL_RGB10 && intFormat != GL_RGBA8) + return true; + if (target == GL_TEXTURE_CUBE_MAP_ARRAY_ARB) { w = h; d *= 6; @@ -486,11 +491,21 @@ test_format(GLenum target, GLenum intFormat) * Use sizes and positions that are multiples of * the compressed block size. */ +#if 0 GLint tw = (rand() % w) & wMask; GLint th = (rand() % h) & hMask; +#else + GLint tw = 81; + GLint th = 59; +#endif GLint td = (rand() % d) & dMask; +#if 0 GLint tx = (rand() % (w - tw)) & wMask; GLint ty = (rand() % (h - th)) & hMask; +#else + GLint tx = 46; + GLint ty = 4; +#endif GLint tz = (rand() % (d - td)) & dMask; /* Recreate the original texture */ @@ -544,7 +559,6 @@ test_format(GLenum target, GLenum intFormat) printf(" internal format: %s\n", piglit_get_gl_enum_name(intFormat)); printf(" region: %d, %d %d x %d\n", tx, ty, tw, th); pass = GL_FALSE; - break; } } @@ -655,9 +669,13 @@ void piglit_init(int argc, char **argv) { static const GLenum core_targets[] = { +#if 0 GL_TEXTURE_1D, +#endif GL_TEXTURE_2D, +#if 0 GL_TEXTURE_3D, +#endif GL_NONE }; static const GLenum array_targets[] = { -- cgit v1.2.3