diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/program/prog_cache.c | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/program/prog_cache.c')
| -rw-r--r-- | mesalib/src/mesa/program/prog_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/prog_cache.c b/mesalib/src/mesa/program/prog_cache.c index 2ccedb5d7..47f926b1b 100644 --- a/mesalib/src/mesa/program/prog_cache.c +++ b/mesalib/src/mesa/program/prog_cache.c @@ -88,7 +88,7 @@ rehash(struct gl_program_cache *cache) cache->last = NULL; size = cache->size * 3; - items = (struct cache_item**) malloc(size * sizeof(*items)); + items = malloc(size * sizeof(*items)); memset(items, 0, size * sizeof(*items)); for (i = 0; i < cache->size; i++) @@ -141,7 +141,7 @@ _mesa_new_program_cache(void) struct gl_program_cache *cache = CALLOC_STRUCT(gl_program_cache); if (cache) { cache->size = 17; - cache->items = (struct cache_item **) + cache->items = calloc(1, cache->size * sizeof(struct cache_item)); if (!cache->items) { free(cache); |