diff options
| author | Vinson Lee <vlee@vmware.com> | 2009-10-23 17:53:48 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2009-10-23 17:53:48 -0700 |
| commit | 86b580047cf5d8aee4e87f80b0478a2aff99e46d (patch) | |
| tree | 65ce3b82e2f691b7bb1b052cbed7be75fd6438dc | |
| parent | 537a3f3b4030f07a187861d1d8c5a4a97445df25 (diff) | |
tex-swizzle: Fix MSVC build.
| -rw-r--r-- | tests/texturing/tex-swizzle.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c index 1943beeb7..cb32350b7 100644 --- a/tests/texturing/tex-swizzle.c +++ b/tests/texturing/tex-swizzle.c @@ -1,3 +1,5 @@ + + /* * Copyright © 2009 Intel Corporation * @@ -56,8 +58,8 @@ probes(); static void loadTex() { - int height = 2; - int width = 2; + #define height 2 + #define width 2 int i, j; GLfloat texData[width][height][4]; @@ -87,6 +89,9 @@ loadTex() glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_FLOAT, texData); + + #undef height + #undef width } @@ -117,6 +122,7 @@ piglit_display(void) { GLenum rgba[4] = {GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA}; int i, j, k; + GLboolean pass = GL_TRUE; glClear(GL_COLOR_BUFFER_BIT); glEnableClientState(GL_VERTEX_ARRAY); @@ -216,8 +222,6 @@ piglit_display(void) glPopMatrix(); - GLboolean pass = GL_TRUE; - pass = probes(); glFinish(); |