projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/st: refactor vertex and fragment shader translation
[mesa.git]
/
progs
/
glsl
/
identity.c
diff --git
a/progs/glsl/identity.c
b/progs/glsl/identity.c
index 37579eb3469c41de9dd3ef32c58a861fd3426361..526e9b82c10997fb427e8bfe18fcd4f8ac968bfe 100644
(file)
--- a/
progs/glsl/identity.c
+++ b/
progs/glsl/identity.c
@@
-9,10
+9,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"
#include "shaderutil.h"
#include "shaderutil.h"
@@
-69,9
+67,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);
}
@@
-141,8
+139,6
@@
Init(void)
if (!ShadersSupported())
exit(1);
if (!ShadersSupported())
exit(1);
- GetExtensionFuncs();
-
if (FragProgFile)
fragShader = CompileShaderFile(GL_FRAGMENT_SHADER, FragProgFile);
else
if (FragProgFile)
fragShader = CompileShaderFile(GL_FRAGMENT_SHADER, FragProgFile);
else
@@
-155,7
+151,7
@@
Init(void)
program = LinkShaders(vertShader, fragShader);
program = LinkShaders(vertShader, fragShader);
- glUseProgram
_func
(program);
+ glUseProgram(program);
/*assert(glGetError() == 0);*/
/*assert(glGetError() == 0);*/
@@
-164,9
+160,9
@@
Init(void)
printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));
printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));
- assert(glIsProgram
_func
(program));
- assert(glIsShader
_func
(fragShader));
- assert(glIsShader
_func
(vertShader));
+ assert(glIsProgram(program));
+ assert(glIsShader(fragShader));
+ assert(glIsShader(vertShader));
glColor3f(1, 0, 0);
}
glColor3f(1, 0, 0);
}
@@
-191,10
+187,10
@@
int
main(int argc, char *argv[])
{
glutInit(&argc, argv);
main(int argc, char *argv[])
{
glutInit(&argc, argv);
- glutInitWindowPosition( 0, 0);
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);