summaryrefslogtreecommitdiff
path: root/progs/glsl/toyball.c
diff options
context:
space:
mode:
Diffstat (limited to 'progs/glsl/toyball.c')
-rw-r--r--progs/glsl/toyball.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/progs/glsl/toyball.c b/progs/glsl/toyball.c
index 2b644acb6d4..7fe27aebfe6 100644
--- a/progs/glsl/toyball.c
+++ b/progs/glsl/toyball.c
@@ -10,10 +10,7 @@
#include <stdlib.h>
#include <math.h>
#include <GL/glew.h>
-#include <GL/gl.h>
#include <GL/glut.h>
-#include <GL/glext.h>
-#include "extfuncs.h"
#include "shaderutil.h"
@@ -100,9 +97,9 @@ Reshape(int width, int height)
static void
CleanUp(void)
{
- glDeleteShader_func(fragShader);
- glDeleteShader_func(vertShader);
- glDeleteProgram_func(program);
+ glDeleteShader(fragShader);
+ glDeleteShader(vertShader);
+ glDeleteProgram(program);
glutDestroyWindow(win);
}
@@ -170,13 +167,11 @@ Init(void)
if (!ShadersSupported())
exit(1);
- GetExtensionFuncs();
-
vertShader = CompileShaderFile(GL_VERTEX_SHADER, VertProgFile);
fragShader = CompileShaderFile(GL_FRAGMENT_SHADER, FragProgFile);
program = LinkShaders(vertShader, fragShader);
- glUseProgram_func(program);
+ glUseProgram(program);
InitUniforms(program, Uniforms);