From f8fe53ca2eef3876e801d7a3b83f50b8e1612dcf Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 17 Jun 2010 12:54:24 -0700 Subject: [PATCH] Change glsl_program to glsl_shader --- main.cpp | 10 +++++----- program.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index 68a8fd2..c8a1a03 100644 --- 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 35f4016..df903ed 100644 --- a/program.h +++ b/program.h @@ -24,9 +24,9 @@ #include /** - * 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; -- 2.7.4