From ee0b1bc7d3fe659e0ed2f34a61b322f2bd2b8843 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 17 Jul 2009 13:23:11 -0600
Subject: progs/glsl: finish conversion to GLEW

This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272.
Remove _func function suffix and unneeded #includes.
---
 progs/glsl/vert-or-frag-only.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'progs/glsl/vert-or-frag-only.c')

diff --git a/progs/glsl/vert-or-frag-only.c b/progs/glsl/vert-or-frag-only.c
index 8e1612aca4..81fcab8c5b 100644
--- a/progs/glsl/vert-or-frag-only.c
+++ b/progs/glsl/vert-or-frag-only.c
@@ -12,10 +12,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"
 
 
@@ -59,14 +56,14 @@ Redisplay(void)
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
    /* render with vertex shader only */
-   glUseProgram_func(VertProgram);
+   glUseProgram(VertProgram);
    glPushMatrix();
    glTranslatef(-1.5, 0, 0);
    DrawQuadTex();
    glPopMatrix();
 
    /* render with fragment shader only */
-   glUseProgram_func(FragProgram);
+   glUseProgram(FragProgram);
    glPushMatrix();
    glTranslatef(+1.5, 0, 0);
    DrawQuadColor();
@@ -91,10 +88,10 @@ Reshape(int width, int height)
 static void
 CleanUp(void)
 {
-   glDeleteShader_func(FragShader);
-   glDeleteShader_func(VertShader);
-   glDeleteProgram_func(VertProgram);
-   glDeleteProgram_func(FragProgram);
+   glDeleteShader(FragShader);
+   glDeleteShader(VertShader);
+   glDeleteProgram(VertProgram);
+   glDeleteProgram(FragProgram);
    glutDestroyWindow(Win);
 }
 
@@ -130,8 +127,6 @@ Init(void)
    if (!ShadersSupported())
       exit(1);
 
-   GetExtensionFuncs();
-
    if (FragProgFile)
       FragShader = CompileShaderFile(GL_FRAGMENT_SHADER, FragProgFile);
    else
@@ -150,10 +145,10 @@ Init(void)
 
    printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));
 
-   assert(glIsProgram_func(VertProgram));
-   assert(glIsProgram_func(FragProgram));
-   assert(glIsShader_func(FragShader));
-   assert(glIsShader_func(VertShader));
+   assert(glIsProgram(VertProgram));
+   assert(glIsProgram(FragProgram));
+   assert(glIsShader(FragShader));
+   assert(glIsShader(VertShader));
 
    glColor3f(1, 0, 0);
 }
-- 
cgit v1.2.3