summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-08-02 20:22:55 +0100
committerDave Airlie <airlied@redhat.com>2011-08-02 20:29:57 +0100
commit3618a561fe3250ea7014005b3e3e0cb8095cae4c (patch)
tree98f85cdb519ab37ab6a1628be13fb03fd351822d
parent838c703bb9be6d89a226f2239dbb44c85d53da57 (diff)
tri-2101010: clean up test fix bugs in conv
-rw-r--r--src/trivial/tri-2101010.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/trivial/tri-2101010.c b/src/trivial/tri-2101010.c
index ff2db5b9..f8e8e09e 100644
--- a/src/trivial/tri-2101010.c
+++ b/src/trivial/tri-2101010.c
@@ -31,11 +31,6 @@
#include <GL/glew.h>
#include "glut_wrap.h"
-
-#define CI_OFFSET_1 16
-#define CI_OFFSET_2 32
-
-
GLenum doubleBuffer = 1;
int win;
@@ -77,8 +72,8 @@ static void Key(unsigned char key, int x, int y)
}
}
-#define i32to10(x) ((x) > 0 ? (x & 0x1ff) : 1024-(abs((x))& 0x1ff))
-#define i32to2(x) ((x) > 0 ? (x & 0x1) : 3-abs((x)))
+#define i32to10(x) ((x) >= 0 ? (x & 0x1ff) : 1024-(abs((x))& 0x1ff))
+#define i32to2(x) ((x) >= 0 ? (x & 0x1) : 3-abs((x)))
static uint32_t iconv(int x, int y, int z, int w)
{
@@ -133,7 +128,6 @@ int main(int argc, char **argv)
{
GLenum type;
-
glutInit(&argc, argv);
if (Args(argc, argv) == GL_FALSE) {