From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 20 Jun 2008 16:47:38 +0000 (-0600)
Subject: mesa: fix some FEATURE_x tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85f553d3c11a1fdf26e8ceb4767742afce0b24ff;p=mesa.git

mesa: fix some FEATURE_x tests
---

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