softpipe: fix up NUM_ENTRIES confusion
authorBrian Paul <brianp@vmware.com>
Thu, 14 Mar 2013 13:45:59 +0000 (07:45 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 15 Mar 2013 00:17:18 +0000 (18:17 -0600)
commitf4a2c29d932b91fe0a311a656b4ce1fa061a4f6b
treef011559414f88e0ce532d7905c8874e9df24a6d1
parent2f6970ae970860acaaaa21b2354f6e447faf15bd
softpipe: fix up NUM_ENTRIES confusion

There were two different NUM_ENTRIES #defines for the framebuffer
tile cache and the texture tile cache.  Rename the later to fix
the warnings:

In file included from sp_flush.c:40:0:
sp_tex_tile_cache.h:76:0: warning: "NUM_ENTRIES" redefined
sp_tile_cache.h:78:0: note: this is the location of the previous definition
In file included from sp_context.c:50:0:
sp_tex_tile_cache.h:76:0: warning: "NUM_ENTRIES" redefined
sp_tile_cache.h:78:0: note: this is the location of the previous definition

Also, replace occurances of NUM_ENTRIES with Element() macro to
be safer.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/drivers/softpipe/sp_tex_tile_cache.h
src/gallium/drivers/softpipe/sp_tile_cache.c