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_storage.c | 38 ++++-------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

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

diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/shader/slang/slang_storage.c
index e7fb63c289..bc32aa4b02 100644
--- a/src/mesa/shader/slang/slang_storage.c
+++ b/src/mesa/shader/slang/slang_storage.c
@@ -48,11 +48,7 @@ slang_storage_array_destruct(slang_storage_array * arr)
 {
    if (arr->aggregate != NULL) {
       slang_storage_aggregate_destruct(arr->aggregate);
-#if USE_MEMPOOL
       _slang_free(arr->aggregate);
-#else
-      slang_alloc_free(arr->aggregate);
-#endif
    }
 }
 
@@ -73,11 +69,7 @@ slang_storage_aggregate_destruct(slang_storage_aggregate * agg)
 
    for (i = 0; i < agg->count; i++)
       slang_storage_array_destruct(agg->arrays + i);
-#if USE_MEMPOOL
    _slang_free(agg->arrays);
-#else
-   slang_alloc_free(agg->arrays);
-#endif
 }
 
 static slang_storage_array *
@@ -86,13 +78,9 @@ slang_storage_aggregate_push_new(slang_storage_aggregate * agg)
    slang_storage_array *arr = NULL;
 
    agg->arrays = (slang_storage_array *)
-#if USE_MEMPOOL
       _slang_realloc(agg->arrays,
-#else
-      slang_alloc_realloc(agg->arrays,
-#endif
-                          agg->count * sizeof(slang_storage_array),
-                          (agg->count + 1) * sizeof(slang_storage_array));
+                     agg->count * sizeof(slang_storage_array),
+                     (agg->count + 1) * sizeof(slang_storage_array));
    if (agg->arrays != NULL) {
       arr = agg->arrays + agg->count;
       if (!slang_storage_array_construct(arr))
@@ -125,21 +113,12 @@ aggregate_matrix(slang_storage_aggregate * agg, slang_storage_type basic_type,
       return GL_FALSE;
    arr->type = SLANG_STORE_AGGREGATE;
    arr->length = columns;
-   arr->aggregate =
-      (slang_storage_aggregate *)
-#if USE_MEMPOOL
+   arr->aggregate = (slang_storage_aggregate *)
       _slang_alloc(sizeof(slang_storage_aggregate));
-#else
-      slang_alloc_malloc(sizeof(slang_storage_aggregate));
-#endif
    if (arr->aggregate == NULL)
       return GL_FALSE;
    if (!slang_storage_aggregate_construct(arr->aggregate)) {
-#if USE_MEMPOOL
       _slang_free(arr->aggregate);
-#else
-      slang_alloc_free(arr->aggregate);
-#endif
       arr->aggregate = NULL;
       return GL_FALSE;
    }
@@ -240,21 +219,12 @@ _slang_aggregate_variable(slang_storage_aggregate * agg,
          if (arr == NULL)
             return GL_FALSE;
          arr->type = SLANG_STORE_AGGREGATE;
-         arr->aggregate =
-            (slang_storage_aggregate *)
-#if USE_MEMPOOL
+         arr->aggregate = (slang_storage_aggregate *)
             _slang_alloc(sizeof(slang_storage_aggregate));
-#else
-            slang_alloc_malloc(sizeof(slang_storage_aggregate));
-#endif
          if (arr->aggregate == NULL)
             return GL_FALSE;
          if (!slang_storage_aggregate_construct(arr->aggregate)) {
-#if USE_MEMPOOL
             _slang_free(arr->aggregate);
-#else
-            slang_alloc_free(arr->aggregate);
-#endif
             arr->aggregate = NULL;
             return GL_FALSE;
          }
-- 
cgit v1.2.3