diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-23 09:10:18 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-23 09:13:26 -0600 |
| commit | 4a72ec49f671015cd556ca2efbe5327f8e02fb28 (patch) | |
| tree | c7ebc870a394b67c22e1c346d642193c46ba06d2 | |
| parent | 2de31f2bf2b9c68aaa76a63fa0d0d3e0731ccfb5 (diff) | |
llvmpipe: rename MAXWIDTH, MAXHEIGHT
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_limits.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_scene.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_surface.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_limits.h b/src/gallium/drivers/llvmpipe/lp_limits.h index 75be000f2f..21776b2d9d 100644 --- a/src/gallium/drivers/llvmpipe/lp_limits.h +++ b/src/gallium/drivers/llvmpipe/lp_limits.h @@ -54,8 +54,8 @@ /** * Max drawing surface size is the max texture size */ -#define MAXHEIGHT (1 << (LP_MAX_TEXTURE_LEVELS - 1)) -#define MAXWIDTH (1 << (LP_MAX_TEXTURE_LEVELS - 1)) +#define LP_MAX_HEIGHT (1 << (LP_MAX_TEXTURE_LEVELS - 1)) +#define LP_MAX_WIDTH (1 << (LP_MAX_TEXTURE_LEVELS - 1)) #endif /* LP_LIMITS_H */ diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h index 273fc02b7c..5166a636a1 100644 --- a/src/gallium/drivers/llvmpipe/lp_scene.h +++ b/src/gallium/drivers/llvmpipe/lp_scene.h @@ -44,8 +44,8 @@ struct lp_scene_queue; /* We're limited to 2K by 2K for 32bit fixed point rasterization. * Will need a 64-bit version for larger framebuffers. */ -#define TILES_X (MAXWIDTH / TILE_SIZE) -#define TILES_Y (MAXHEIGHT / TILE_SIZE) +#define TILES_X (LP_MAX_WIDTH / TILE_SIZE) +#define TILES_Y (LP_MAX_HEIGHT / TILE_SIZE) #define CMD_BLOCK_MAX 128 diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c index 7d86c5750c..63b8f27b39 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_surface.c +++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c @@ -52,8 +52,8 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe, boolean changed = !util_framebuffer_state_equal(&lp->framebuffer, fb); - assert(fb->width <= MAXWIDTH); - assert(fb->height <= MAXHEIGHT); + assert(fb->width <= LP_MAX_WIDTH); + assert(fb->height <= LP_MAX_HEIGHT); if (changed) { |