Clean-up and re-org of the main GLSL object types.

Use the gl_shader struct as it should be.
Renamed gl_linked_program to gl_shader_program.
Store both shaders and programs in the same hash table and use the Type field
to distinguish them.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mesa/shader/shader_api.h b/src/mesa/shader/shader_api.h
index 723f92690d..2f73bb8887 100644
--- a/src/mesa/shader/shader_api.h
+++ b/src/mesa/shader/shader_api.h
@@ -38,24 +38,24 @@
 extern void
 _mesa_init_shader_state(GLcontext * ctx);
 
-extern struct gl_linked_program *
-_mesa_new_linked_program(GLcontext *ctx, GLuint name);
+extern struct gl_shader_program *
+_mesa_new_shader_program(GLcontext *ctx, GLuint name);
 
 extern void
-_mesa_free_linked_program_data(GLcontext *ctx,
-                               struct gl_linked_program *linked);
+_mesa_free_shader_program_data(GLcontext *ctx,
+                               struct gl_shader_program *shProg);
 
 extern void
-_mesa_delete_linked_program(GLcontext *ctx, struct gl_linked_program *linked);
+_mesa_delete_shader_program(GLcontext *ctx, struct gl_shader_program *shProg);
 
-extern struct gl_linked_program *
-_mesa_lookup_linked_program(GLcontext *ctx, GLuint name);
+extern struct gl_shader_program *
+_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
 
 
 extern struct gl_shader *
 _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
 
-extern struct gl_program *
+extern struct gl_shader *
 _mesa_lookup_shader(GLcontext *ctx, GLuint name);