projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[mesa.git]
/
progs
/
tests
/
exactrast.c
diff --git
a/progs/tests/exactrast.c
b/progs/tests/exactrast.c
index 56c0c79c3fadb1d459bc8c4d51e463ab85474035..63b8336d97321c9132f397cf372fff2c7024c899 100644
(file)
--- a/
progs/tests/exactrast.c
+++ b/
progs/tests/exactrast.c
@@
-26,6
+26,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <GL/glew.h>
#include <GL/glut.h>
static int Width = 400, Height = 400;
#include <GL/glut.h>
static int Width = 400, Height = 400;
@@
-34,14
+35,14
@@
static float Xtrans = 0, Ytrans = 0;
static float Step = 0.125;
enum {
static float Step = 0.125;
enum {
- POINTS,
- HLINES,
- VLINES,
- QUADS,
+
MODE_
POINTS,
+
MODE_
HLINES,
+
MODE_
VLINES,
+
MODE_
QUADS,
NUM_MODES
};
NUM_MODES
};
-static int Mode = POINTS;
+static int Mode =
MODE_
POINTS;
static void
static void
@@
-58,7
+59,7
@@
Draw(void)
glPushMatrix();
glTranslatef(tx + Xtrans, ty + Ytrans, 0);
glPushMatrix();
glTranslatef(tx + Xtrans, ty + Ytrans, 0);
- if (Mode == POINTS) {
+ if (Mode ==
MODE_
POINTS) {
glBegin(GL_POINTS);
for (j = 0; j < Height; j += 2) {
for (i = 0; i < Width; i += 2) {
glBegin(GL_POINTS);
for (j = 0; j < Height; j += 2) {
for (i = 0; i < Width; i += 2) {
@@
-67,7
+68,7
@@
Draw(void)
}
glEnd();
}
}
glEnd();
}
- else if (Mode == HLINES) {
+ else if (Mode ==
MODE_
HLINES) {
glBegin(GL_LINES);
for (i = 0; i < Height; i += 2) {
glVertex2f(0, i);
glBegin(GL_LINES);
for (i = 0; i < Height; i += 2) {
glVertex2f(0, i);
@@
-75,7
+76,7
@@
Draw(void)
}
glEnd();
}
}
glEnd();
}
- else if (Mode == VLINES) {
+ else if (Mode ==
MODE_
VLINES) {
glBegin(GL_LINES);
for (i = 0; i < Width; i += 2) {
glVertex2f(i, 0 );
glBegin(GL_LINES);
for (i = 0; i < Width; i += 2) {
glVertex2f(i, 0 );
@@
-83,7
+84,7
@@
Draw(void)
}
glEnd();
}
}
glEnd();
}
- else if (Mode == QUADS) {
+ else if (Mode ==
MODE_
QUADS) {
glBegin(GL_QUADS);
for (j = 0; j < Height; j += 4) {
for (i = 0; i < Width; i += 4) {
glBegin(GL_QUADS);
for (j = 0; j < Height; j += 4) {
for (i = 0; i < Width; i += 4) {
@@
-189,6
+190,7
@@
main(int argc, char *argv[])
glutInitWindowSize(Width, Height);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
Win = glutCreateWindow(argv[0]);
glutInitWindowSize(Width, Height);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
Win = glutCreateWindow(argv[0]);
+ glewInit();
glutReshapeFunc(Reshape);
glutKeyboardFunc(Key);
glutSpecialFunc(SpecialKey);
glutReshapeFunc(Reshape);
glutKeyboardFunc(Key);
glutSpecialFunc(SpecialKey);