diff options
| author | Brian Paul <[email protected]> | 2008-06-20 10:47:38 -0600 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-21 22:13:55 -0700 |
| commit | 85f553d3c11a1fdf26e8ceb4767742afce0b24ff (patch) | |
| tree | 38545db485151bc7151b0a901c6ecc6508855356 | |
| parent | b51d73dd943de688be7e65057af150e8eb92ae21 (diff) | |
mesa: fix some FEATURE_x tests
| -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 9c4c0bfd6b4..5887344fab3 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 *) @@ -525,10 +523,8 @@ cleanup: _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 @@ -746,10 +742,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 |