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, 4 insertions, 5 deletions

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 1d8666888ef..947d3136d5b 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -949,8 +949,7 @@ update_arrays( GLcontext *ctx )
 static void
 update_program(GLcontext *ctx)
 {
-   const struct gl_linked_program *linked = ctx->Shader.CurrentProgram;
-
+   const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
 
    /* These _Enabled flags indicate if the program is enabled AND valid. */
    ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
@@ -973,10 +972,10 @@ update_program(GLcontext *ctx)
 
    ctx->FragmentProgram._Current = NULL;
 
-   if (linked && linked->LinkStatus) {
+   if (shProg && shProg->LinkStatus) {
       /* Use shader programs */
-      ctx->VertexProgram._Current = linked->VertexProgram;
-      ctx->FragmentProgram._Current = linked->FragmentProgram;
+      ctx->VertexProgram._Current = shProg->VertexProgram;
+      ctx->FragmentProgram._Current = shProg->FragmentProgram;
    }
    else {
       if (ctx->VertexProgram._Enabled) {