Change glsl_program to glsl_shader

This commit is contained in:
Ian Romanick 2010-06-17 12:54:24 -07:00
parent 6fd9fb23de
commit f8fe53ca2e
2 changed files with 7 additions and 7 deletions

View file

@ -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;

View file

@ -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;