Reject invalid dimensions

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

1 files changed, 13 insertions, 6 deletions

diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c
index 5d38736da..bb2f2ab50 100644
--- a/tests/texturing/texsubimage.c
+++ b/tests/texturing/texsubimage.c
@@ -482,16 +482,23 @@ test_format(GLenum target, GLenum intFormat)
 	glDeleteTextures(1, &tex);
 
 	for (t = 0; t < 10; t++) {
+		GLint tw = 0;
+		GLint th = 0;
+		GLint td = 0;
+                GLint tx, ty, tz;
+
 		/* Choose random region of texture to update.
 		 * Use sizes and positions that are multiples of
 		 * the compressed block size.
 		 */
-		GLint tw = (rand() % w) & wMask;
-		GLint th = (rand() % h) & hMask;
-		GLint td = (rand() % d) & dMask;
-		GLint tx = (rand() % (w - tw)) & wMask;
-		GLint ty = (rand() % (h - th)) & hMask;
-		GLint tz = (rand() % (d - td)) & dMask;
+                while (!tw || (h > 1 && !th) || (d > 1 && !td)) {
+                   tw = (rand() % w) & wMask;
+                   th = (rand() % h) & hMask;
+                   td = (rand() % d) & dMask;
+                   tx = (rand() % (w - tw)) & wMask;
+                   ty = (rand() % (h - th)) & hMask;
+                   tz = (rand() % (d - td)) & dMask;
+                }
 
 		/* Recreate the original texture */
 		tex = create_texture(target, intFormat, w, h, d,