From e261d66d81d47c4a2380ffcb7b39164b8e191168 Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
Date: Sat, 21 Apr 2007 12:29:46 -0600
Subject: Remove all the USE_MEMPOOL debug code.

---
 src/mesa/shader/slang/slang_compile_struct.c | 33 ++--------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'src/mesa/shader/slang/slang_compile_struct.c')

diff --git a/src/mesa/shader/slang/slang_compile_struct.c b/src/mesa/shader/slang/slang_compile_struct.c
index 4a4773217a..97a34d24fe 100644
--- a/src/mesa/shader/slang/slang_compile_struct.c
+++ b/src/mesa/shader/slang/slang_compile_struct.c
@@ -48,11 +48,7 @@ slang_struct_scope_destruct(slang_struct_scope * scope)
 
    for (i = 0; i < scope->num_structs; i++)
       slang_struct_destruct(scope->structs + i);
-#if USE_MEMPOOL
    _slang_free(scope->structs);
-#else
-   slang_alloc_free(scope->structs);
-#endif
    /* do not free scope->outer_scope */
 }
 
@@ -63,13 +59,8 @@ slang_struct_scope_copy(slang_struct_scope * x, const slang_struct_scope * y)
    GLuint i;
 
    _slang_struct_scope_ctr(&z);
-   z.structs =
-#if USE_MEMPOOL
-      (slang_struct *) _slang_alloc(y->num_structs *
-#else
-      (slang_struct *) slang_alloc_malloc(y->num_structs *
-#endif
-                                          sizeof(slang_struct));
+   z.structs = (slang_struct *)
+      _slang_alloc(y->num_structs * sizeof(slang_struct));
    if (z.structs == NULL) {
       slang_struct_scope_destruct(&z);
       return 0;
@@ -111,28 +102,16 @@ slang_struct_construct(slang_struct * stru)
 {
    stru->a_name = SLANG_ATOM_NULL;
    stru->fields = (slang_variable_scope *)
-#if USE_MEMPOOL
       _slang_alloc(sizeof(slang_variable_scope));
-#else
-      slang_alloc_malloc(sizeof(slang_variable_scope));
-#endif
    if (stru->fields == NULL)
       return 0;
    _slang_variable_scope_ctr(stru->fields);
 
    stru->structs =
-#if USE_MEMPOOL
       (slang_struct_scope *) _slang_alloc(sizeof(slang_struct_scope));
-#else
-      (slang_struct_scope *) slang_alloc_malloc(sizeof(slang_struct_scope));
-#endif
    if (stru->structs == NULL) {
       slang_variable_scope_destruct(stru->fields);
-#if USE_MEMPOOL
       _slang_free(stru->fields);
-#else
-      slang_alloc_free(stru->fields);
-#endif
       return 0;
    }
    _slang_struct_scope_ctr(stru->structs);
@@ -143,17 +122,9 @@ void
 slang_struct_destruct(slang_struct * stru)
 {
    slang_variable_scope_destruct(stru->fields);
-#if USE_MEMPOOL
    _slang_free(stru->fields);
-#else
-   slang_alloc_free(stru->fields);
-#endif
    slang_struct_scope_destruct(stru->structs);
-#if USE_MEMPOOL
    _slang_free(stru->structs);
-#else
-   slang_alloc_free(stru->structs);
-#endif
 }
 
 int
-- 
cgit v1.2.3