diff options
| author | Brian <brian@yutani.localnet.net> | 2006-12-19 18:46:56 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2006-12-19 18:46:56 -0700 |
| commit | 65a18442e5d846940714bb662f5b1bb47ab60c29 (patch) | |
| tree | db8554850401753e441a8c49b815f48f7df5a150 /src/mesa/main/context.c | |
| parent | 0bf5dbe002a64e198f55724cc1542602c012490f (diff) | |
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.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index c5220b5b2e..2196591ba2 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -706,7 +706,6 @@ alloc_shared_state( GLcontext *ctx ) #if FEATURE_ARB_shader_objects ss->ShaderObjects = _mesa_NewHashTable(); - ss->ProgramObjects = _mesa_NewHashTable(); #endif ss->Default1D = (*ctx->Driver.NewTextureObject)(ctx, 0, GL_TEXTURE_1D); @@ -785,8 +784,6 @@ alloc_shared_state( GLcontext *ctx ) #if FEATURE_ARB_shader_objects if (ss->ShaderObjects) _mesa_DeleteHashTable (ss->ShaderObjects); - if (ss->ProgramObjects) - _mesa_DeleteHashTable (ss->ProgramObjects); #endif #if FEATURE_EXT_framebuffer_object |