s/GL_SHADER_PROGRAM/GL_SHADER_PROGRAM_MESA/ (a Mesa-specific token)

This commit is contained in:
Brian 2007-04-18 14:53:23 -06:00
parent 6d3d9c1c6d
commit f3e8c32376
3 changed files with 6 additions and 6 deletions

View file

@ -629,7 +629,7 @@ delete_shader_cb(GLuint id, void *data, void *userData)
}
else {
struct gl_shader_program *shProg = (struct gl_shader_program *) data;
ASSERT(shProg->Type == GL_SHADER_PROGRAM);
ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA);
_mesa_free_shader_program(ctx, shProg);
}
}

View file

@ -47,7 +47,7 @@
/**
* Special, internal token
*/
#define GL_SHADER_PROGRAM 0x9999
#define GL_SHADER_PROGRAM_MESA 0x9999
/**

View file

@ -58,7 +58,7 @@ _mesa_new_shader_program(GLcontext *ctx, GLuint name)
struct gl_shader_program *shProg;
shProg = CALLOC_STRUCT(gl_shader_program);
if (shProg) {
shProg->Type = GL_SHADER_PROGRAM;
shProg->Type = GL_SHADER_PROGRAM_MESA;
shProg->Name = name;
shProg->RefCount = 1;
shProg->Attributes = _mesa_new_parameter_list();
@ -114,7 +114,7 @@ _mesa_free_shader_program_data(GLcontext *ctx,
{
GLuint i;
assert(shProg->Type == GL_SHADER_PROGRAM);
assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
_mesa_clear_shader_program_data(ctx, shProg);
@ -204,7 +204,7 @@ _mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
* in the same hash table. Check the object's type to be sure it's
* what we're expecting.
*/
if (shProg && shProg->Type != GL_SHADER_PROGRAM) {
if (shProg && shProg->Type != GL_SHADER_PROGRAM_MESA) {
return NULL;
}
return shProg;
@ -308,7 +308,7 @@ _mesa_lookup_shader(GLcontext *ctx, GLuint name)
* in the same hash table. Check the object's type to be sure it's
* what we're expecting.
*/
if (sh && sh->Type == GL_SHADER_PROGRAM) {
if (sh && sh->Type == GL_SHADER_PROGRAM_MESA) {
assert(sh->Type == GL_VERTEX_SHADER ||
sh->Type == GL_FRAGMENT_SHADER);
return NULL;