mesa: Remove checks of Visual.rgbMode in Get paths

[mesa.git] / src / mesa / shader / hash_table.c

diff --git a/src/mesa/shader/hash_table.c b/src/mesa/shader/hash_table.c
index 881179f9d850dbae5402d5b26c0bc0f41a602fc1..fa6ba2bfdfcd8a27fba1a845711a81857016a50d 100644 (file)
--- a/src/mesa/shader/hash_table.c
+++ b/src/mesa/shader/hash_table.c
@@ -27,10 +27,6 @@
  *
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
-#include <stdlib.h>
-#include <string.h>
-
-#include <assert.h>
 
 #include "main/imports.h"
 #include "main/simple_list.h"
@@ -69,7 +65,7 @@ hash_table_ctor(unsigned num_buckets, hash_func_t hash,
         num_buckets = 16;
     }
 
-    ht = _mesa_malloc(sizeof(*ht) + ((num_buckets - 1) 
+    ht = malloc(sizeof(*ht) + ((num_buckets - 1) 
                                     * sizeof(ht->buckets[0])));
     if (ht != NULL) {
         ht->hash = hash;
@@ -89,7 +85,7 @@ void
 hash_table_dtor(struct hash_table *ht)
 {
    hash_table_clear(ht);
-   _mesa_free(ht);
+   free(ht);
 }
 
 
@@ -104,7 +100,7 @@ hash_table_clear(struct hash_table *ht)
    for (i = 0; i < ht->num_buckets; i++) {
       foreach_s(node, temp, & ht->buckets[i]) {
         remove_from_list(node);
-        _mesa_free(node);
+        free(node);
       }
 
       assert(is_empty_list(& ht->buckets[i]));
@@ -138,7 +134,7 @@ hash_table_insert(struct hash_table *ht, void *data, const void *key)
     const unsigned bucket = hash_value % ht->num_buckets;
     struct hash_node *node;
 
-    node = _mesa_calloc(sizeof(*node));
+    node = calloc(1, sizeof(*node));
 
     node->data = data;
     node->key = key;