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_operation.c | 42 +++++--------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

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

diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c
index c19a1b101b..b18e08d2ae 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/src/mesa/shader/slang/slang_compile_operation.c
@@ -61,11 +61,9 @@ slang_operation_destruct(slang_operation * oper)
 
    for (i = 0; i < oper->num_children; i++)
       slang_operation_destruct(oper->children + i);
-#if !USE_MEMPOOL
-   slang_alloc_free(oper->children);
+   _slang_free(oper->children);
    slang_variable_scope_destruct(oper->locals);
-   slang_alloc_free(oper->locals);
-#endif
+   _slang_free(oper->locals);
    oper->children = NULL;
    oper->num_children = 0;
    oper->locals = NULL;
@@ -85,11 +83,7 @@ slang_operation_copy(slang_operation * x, const slang_operation * y)
       return GL_FALSE;
    z.type = y->type;
    z.children = (slang_operation *)
-#if USE_MEMPOOL
       _slang_alloc(y->num_children * sizeof(slang_operation));
-#else
-      slang_alloc_malloc(y->num_children * sizeof(slang_operation));
-#endif
    if (z.children == NULL) {
       slang_operation_destruct(&z);
       return GL_FALSE;
@@ -135,11 +129,7 @@ slang_operation *
 slang_operation_new(GLuint count)
 {
    slang_operation *ops
-#if USE_MEMPOOL
        = (slang_operation *) _slang_alloc(count * sizeof(slang_operation));
-#else
-       = (slang_operation *) _mesa_malloc(count * sizeof(slang_operation));
-#endif
    assert(count > 0);
    if (ops) {
       GLuint i;
@@ -157,9 +147,7 @@ void
 slang_operation_delete(slang_operation *oper)
 {
    slang_operation_destruct(oper);
-#if !USE_MEMPOOL
-   _mesa_free(oper);
-#endif
+   _slang_free(oper);
 }
 
 
@@ -169,19 +157,13 @@ slang_operation_grow(GLuint *numChildren, slang_operation **children)
    slang_operation *ops;
 
    ops = (slang_operation *)
-#if USE_MEMPOOL
       _slang_realloc(*children,
-#else
-      slang_alloc_realloc(*children,
-#endif
-                          *numChildren * sizeof(slang_operation),
-                          (*numChildren + 1) * sizeof(slang_operation));
+                     *numChildren * sizeof(slang_operation),
+                     (*numChildren + 1) * sizeof(slang_operation));
    if (ops) {
       slang_operation *newOp = ops + *numChildren;
       if (!slang_operation_construct(newOp)) {
-#if !USE_MEMPOOL
-         _mesa_free(ops);
-#endif
+         _slang_free(ops);
          *children = NULL;
          return NULL;
       }
@@ -208,11 +190,7 @@ slang_operation_insert(GLuint *numElements, slang_operation **array,
    assert(pos <= *numElements);
 
    ops = (slang_operation *)
-#if USE_MEMPOOL
       _slang_alloc((*numElements + 1) * sizeof(slang_operation));
-#else
-      _mesa_malloc((*numElements + 1) * sizeof(slang_operation));
-#endif
    if (ops) {
       slang_operation *newOp;
       newOp = ops + pos;
@@ -223,17 +201,13 @@ slang_operation_insert(GLuint *numElements, slang_operation **array,
                       (*numElements - pos) * sizeof(slang_operation));
 
       if (!slang_operation_construct(newOp)) {
-#if !USE_MEMPOOL
-         _mesa_free(ops);
-#endif
+         _slang_free(ops);
          *numElements = 0;
          *array = NULL;
          return NULL;
       }
-#if !USE_MEMPOOL
       if (*array)
-         _mesa_free(*array);
-#endif
+         _slang_free(*array);
       *array = ops;
       (*numElements)++;
       return newOp;
-- 
cgit v1.2.3