Change glsl_program to glsl_shader

diff --git a/main.cpp b/main.cpp
index 68a8fd2b6918cad3136ef748f86a0685384d1844..c8a1a038af8564f2a671766c5c9a3990cc3fb159 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -98,7 +98,7 @@ const struct option compiler_opts[] = {
 };
 
 void
-compile_shader(struct glsl_program *prog)
+compile_shader(struct glsl_shader *prog)
 {
    struct _mesa_glsl_parse_state state;
 
@@ -175,16 +175,16 @@ main(int argc, char **argv)
    if (argc <= optind)
       usage_fail(argv[0]);
 
-   struct glsl_program **prog_list = NULL;
+   struct glsl_shader **prog_list = NULL;
    unsigned prog_list_len = 0;
 
    for (/* empty */; argc > optind; optind++) {
-      prog_list = (struct glsl_program **)
+      prog_list = (struct glsl_shader **)
         realloc(prog_list,
-                sizeof(struct glsl_program *) * (prog_list_len + 1));
+                sizeof(struct glsl_shader *) * (prog_list_len + 1));
       assert(prog_list != NULL);
 
-      struct glsl_program *prog = new glsl_program;
+      struct glsl_shader *prog = new glsl_shader;
       memset(prog, 0, sizeof(*prog));
 
       prog_list[prog_list_len] = prog;

diff --git a/program.h b/program.h
index 35f401696a2cdc06b77629c4a32a4717ebca210e..df903edc95ca5e4ca0e9a9732d6dea6149cbc19c 100644 (file)
--- a/program.h
+++ b/program.h
@@ -24,9 +24,9 @@
 #include <GL/gl.h>
 
 /**
- * Based on gl_program in Mesa's mtypes.h.
+ * Based on gl_shader in Mesa's mtypes.h.
  */
-struct glsl_program {
+struct glsl_shader {
    GLenum Type;
    GLuint Name;
    GLint RefCount;