fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 11:00:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'mesa_7_6_branch'

Browse source 
Conflicts:

	src/gallium/drivers/softpipe/sp_tile_cache.c
This commit is contained in:
Brian Paul 2009-09-23 11:00:04 -06:00
commit de25f82067
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/softpipe/sp_tex_tile_cache.h
View file

@ -68,12 +68,6 @@ struct softpipe_tex_cached_tile
#define NUM_ENTRIES 50
/** XXX move these */
#define MAX_WIDTH 2048
#define MAX_HEIGHT 2048
struct softpipe_tex_tile_cache
{
struct pipe_screen *screen;

6
src/gallium/drivers/softpipe/sp_tile_cache.c
View file

@ -82,6 +82,12 @@ sp_create_tile_cache( struct pipe_screen *screen )
{
struct softpipe_tile_cache *tc;
uint pos;
int maxLevels, maxTexSize;
/* sanity checking: max sure MAX_WIDTH/HEIGHT >= largest texture image */
maxLevels = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
maxTexSize = 1 << (maxLevels - 1);
assert(MAX_WIDTH >= maxTexSize);
tc = CALLOC_STRUCT( softpipe_tile_cache );
if (tc) {

4
src/gallium/drivers/softpipe/sp_tile_cache.h
View file

@ -74,8 +74,8 @@ struct softpipe_cached_tile
/** XXX move these */
#define MAX_WIDTH 2048
#define MAX_HEIGHT 2048
#define MAX_WIDTH 4096
#define MAX_HEIGHT 4096
struct softpipe_tile_cache