projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/trivial: add dlist-flat-tri.c
[mesa.git]
/
progs
/
trivial
/
fs-tri.c
diff --git
a/progs/trivial/fs-tri.c
b/progs/trivial/fs-tri.c
index 3be4d42e54cd8d7fc6a99216d72f1e362c8a0fcb..6e86df1dcfad329ec5d7d9a35ea5ccbd0e5356ab 100644
(file)
--- a/
progs/trivial/fs-tri.c
+++ b/
progs/trivial/fs-tri.c
@@
-5,10
+5,8
@@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-#include <GL/gl.h>
+#include <GL/gl
ew
.h>
#include <GL/glut.h>
#include <GL/glut.h>
-#include <GL/glext.h>
-#include "extfuncs.h"
static GLuint fragShader;
static GLuint fragShader;
@@
-56,9
+54,9
@@
Reshape(int width, int height)
static void
CleanUp(void)
{
static void
CleanUp(void)
{
- glDeleteShader
_func
(fragShader);
- glDeleteShader
_func
(vertShader);
- glDeleteProgram
_func
(program);
+ glDeleteShader(fragShader);
+ glDeleteShader(vertShader);
+ glDeleteProgram(program);
glutDestroyWindow(win);
}
glutDestroyWindow(win);
}
@@
-110,15
+108,15
@@
LoadAndCompileShader(GLuint shader, const char *text)
{
GLint stat;
{
GLint stat;
- glShaderSource
_func
(shader, 1, (const GLchar **) &text, NULL);
+ glShaderSource(shader, 1, (const GLchar **) &text, NULL);
- glCompileShader
_func
(shader);
+ glCompileShader(shader);
- glGetShaderiv
_func
(shader, GL_COMPILE_STATUS, &stat);
+ glGetShaderiv(shader, GL_COMPILE_STATUS, &stat);
if (!stat) {
GLchar log[1000];
GLsizei len;
if (!stat) {
GLchar log[1000];
GLsizei len;
- glGetShaderInfoLog
_func
(shader, 1000, &len, log);
+ glGetShaderInfoLog(shader, 1000, &len, log);
fprintf(stderr, "fslight: problem compiling shader:\n%s\n", log);
exit(1);
}
fprintf(stderr, "fslight: problem compiling shader:\n%s\n", log);
exit(1);
}
@@
-129,11
+127,11
@@
static void
CheckLink(GLuint prog)
{
GLint stat;
CheckLink(GLuint prog)
{
GLint stat;
- glGetProgramiv
_func
(prog, GL_LINK_STATUS, &stat);
+ glGetProgramiv(prog, GL_LINK_STATUS, &stat);
if (!stat) {
GLchar log[1000];
GLsizei len;
if (!stat) {
GLchar log[1000];
GLsizei len;
- glGetProgramInfoLog
_func
(prog, 1000, &len, log);
+ glGetProgramInfoLog(prog, 1000, &len, log);
fprintf(stderr, "Linker error:\n%s\n", log);
}
}
fprintf(stderr, "Linker error:\n%s\n", log);
}
}
@@
-165,24
+163,22
@@
Init(void)
exit(1);
}
exit(1);
}
- GetExtensionFuncs();
-
- fragShader = glCreateShader_func(GL_FRAGMENT_SHADER);
+ fragShader = glCreateShader(GL_FRAGMENT_SHADER);
LoadAndCompileShader(fragShader, fragShaderText);
#if 0
LoadAndCompileShader(fragShader, fragShaderText);
#if 0
- vertShader = glCreateShader
_func
(GL_VERTEX_SHADER);
+ vertShader = glCreateShader(GL_VERTEX_SHADER);
LoadAndCompileShader(vertShader, vertShaderText);
#endif
LoadAndCompileShader(vertShader, vertShaderText);
#endif
- program = glCreateProgram
_func
();
- glAttachShader
_func
(program, fragShader);
+ program = glCreateProgram();
+ glAttachShader(program, fragShader);
#if 0
#if 0
- glAttachShader
_func
(program, vertShader);
+ glAttachShader(program, vertShader);
#endif
#endif
- glLinkProgram
_func
(program);
+ glLinkProgram(program);
CheckLink(program);
CheckLink(program);
- glUseProgram
_func
(program);
+ glUseProgram(program);
assert(glGetError() == 0);
assert(glGetError() == 0);
@@
-200,6
+196,7
@@
main(int argc, char *argv[])
glutInitWindowSize(200, 200);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
win = glutCreateWindow(argv[0]);
glutInitWindowSize(200, 200);
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
win = glutCreateWindow(argv[0]);
+ glewInit();
glutReshapeFunc(Reshape);
glutKeyboardFunc(Key);
glutSpecialFunc(SpecialKey);
glutReshapeFunc(Reshape);
glutKeyboardFunc(Key);
glutSpecialFunc(SpecialKey);