aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2014-09-19 08:40:36 -0600
committerBrian Paul <brianp@vmware.com>2014-09-23 16:47:26 -0600
commit4053c7fd176a5fbe906de32bec632ff9ac4a6659 (patch)
tree1a3f4ed5e2c1ecd24e7a6ed9e8c374a62ce65852
parent29f5ff250fabb2b9f0fa80efbca7d3175fab76d8 (diff)
downloadpiglit-4053c7fd176a5fbe906de32bec632ff9ac4a6659.tar.gz
fs-discard-exit-2: use default window size
To fix Windows run.
-rw-r--r--tests/spec/glsl-1.30/execution/fs-discard-exit-2.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c
index 2a003fea8..e9b6cd234 100644
--- a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c
+++ b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c
@@ -48,12 +48,12 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
- config.window_width = 64;
- config.window_height = 64;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
PIGLIT_GL_TEST_CONFIG_END
+#define SIZE 64
+
static int coord1_location, coord2_location;
static const char *vs_source =
@@ -90,7 +90,12 @@ piglit_display(void)
{
int x, y;
bool pass = true;
- float expected[64 * 64 * 4];
+ float expected[SIZE * SIZE * 4];
+
+ assert(piglit_width >= SIZE);
+ assert(piglit_height >= SIZE);
+
+ glViewport(0, 0, SIZE, SIZE);
glClearColor(0.0, 1.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
@@ -106,8 +111,8 @@ piglit_display(void)
}
}
- for (x = 0; x < 64; x++) {
- for (y = 0; y < 64; y++) {
+ for (x = 0; x < SIZE; x++) {
+ for (y = 0; y < SIZE; y++) {
int sx = x % 8;
int sy = y % 8;
int dx = fabs(sx - x / 8);
@@ -131,11 +136,11 @@ piglit_display(void)
pixel[2] += 0.1;
}
- memcpy(expected + (y * 64 + x) * 4, pixel, 4 * 4);
+ memcpy(expected + (y * SIZE + x) * 4, pixel, 4 * 4);
}
}
- pass = piglit_probe_image_rgba(0, 0, 64, 64, expected);
+ pass = piglit_probe_image_rgba(0, 0, SIZE, SIZE, expected);
piglit_present_results();