diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2010-06-17 12:54:24 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-06-17 12:54:24 -0700 |
commit | f8fe53ca2eef3876e801d7a3b83f50b8e1612dcf (patch) | |
tree | 3c06b597b7d09f30fe2ec0f83983698f05189b70 /main.cpp | |
parent | 6fd9fb23de908ec52089fdc6e24af9e2ebbe126e (diff) |
Change glsl_program to glsl_shader
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; |