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_function.c | 28 ++------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

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

diff --git a/src/mesa/shader/slang/slang_compile_function.c b/src/mesa/shader/slang/slang_compile_function.c
index bb5be3feec..80769b33ae 100644
--- a/src/mesa/shader/slang/slang_compile_function.c
+++ b/src/mesa/shader/slang/slang_compile_function.c
@@ -44,11 +44,7 @@ slang_fixup_table_init(slang_fixup_table * fix)
 void
 slang_fixup_table_free(slang_fixup_table * fix)
 {
-#if USE_MEMPOOL
    _slang_free(fix->table);
-#else
-   slang_alloc_free(fix->table);
-#endif
    slang_fixup_table_init(fix);
 }
 
@@ -59,13 +55,9 @@ GLboolean
 slang_fixup_save(slang_fixup_table *fixups, GLuint address)
 {
    fixups->table = (GLuint *)
-#if USE_MEMPOOL
       _slang_realloc(fixups->table,
-#else
-      slang_alloc_realloc(fixups->table,
-#endif
-                          fixups->count * sizeof(GLuint),
-                          (fixups->count + 1) * sizeof(GLuint));
+                     fixups->count * sizeof(GLuint),
+                     (fixups->count + 1) * sizeof(GLuint));
    if (fixups->table == NULL)
       return GL_FALSE;
    fixups->table[fixups->count] = address;
@@ -85,11 +77,7 @@ slang_function_construct(slang_function * func)
       return 0;
 
    func->parameters = (slang_variable_scope *)
-#if USE_MEMPOOL
       _slang_alloc(sizeof(slang_variable_scope));
-#else
-      slang_alloc_malloc(sizeof(slang_variable_scope));
-#endif
    if (func->parameters == NULL) {
       slang_variable_destruct(&func->header);
       return 0;
@@ -108,18 +96,10 @@ slang_function_destruct(slang_function * func)
 {
    slang_variable_destruct(&func->header);
    slang_variable_scope_destruct(func->parameters);
-#if USE_MEMPOOL
    _slang_free(func->parameters);
-#else
-   slang_alloc_free(func->parameters);
-#endif
    if (func->body != NULL) {
       slang_operation_destruct(func->body);
-#if USE_MEMPOOL
       _slang_free(func->body);
-#else
-      slang_alloc_free(func->body);
-#endif
    }
    slang_fixup_table_free(&func->fixups);
 }
@@ -143,11 +123,7 @@ slang_function_scope_destruct(slang_function_scope * scope)
 
    for (i = 0; i < scope->num_functions; i++)
       slang_function_destruct(scope->functions + i);
-#if USE_MEMPOOL
    _slang_free(scope->functions);
-#else
-   slang_alloc_free(scope->functions);
-#endif
 }
 
 
-- 
cgit v1.2.3