diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-20 10:47:38 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-06-20 10:47:38 -0600 |
| commit | 95c9fc82f58a8f38d25b3e405891566c8f8a51f6 (patch) | |
| tree | a9e76f2d810d226fa19a3ddf28afadc4d1fafa91 /src | |
| parent | a87e717d0d302bc376eff29d17d35f1314ff1a57 (diff) | |
mesa: fix some FEATURE_x tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/context.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index bd90027c8a..e5264bcaf9 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -441,9 +441,7 @@ alloc_shared_state( GLcontext *ctx ) ss->DisplayList = _mesa_NewHashTable(); ss->TexObjects = _mesa_NewHashTable(); -#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program ss->Programs = _mesa_NewHashTable(); -#endif #if FEATURE_ARB_vertex_program ss->DefaultVertexProgram = (struct gl_vertex_program *) @@ -533,10 +531,8 @@ alloc_shared_state( GLcontext *ctx ) _mesa_DeleteHashTable(ss->DisplayList); if (ss->TexObjects) _mesa_DeleteHashTable(ss->TexObjects); -#if FEATURE_NV_vertex_program if (ss->Programs) _mesa_DeleteHashTable(ss->Programs); -#endif #if FEATURE_ARB_vertex_program _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL); #endif @@ -723,10 +719,9 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) _mesa_DeleteHashTable(ss->ShaderObjects); #endif -#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_NV_fragment_program) _mesa_HashDeleteAll(ss->Programs, delete_program_cb, ctx); _mesa_DeleteHashTable(ss->Programs); -#endif + #if FEATURE_ARB_vertex_program _mesa_reference_vertprog(ctx, &ss->DefaultVertexProgram, NULL); #endif |