diff options
| author | Marek Olšák <[email protected]> | 2009-12-21 02:10:34 +0100 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2010-01-06 12:49:15 -0800 |
| commit | ddfc4e31ada05148ed1eb56f89efe1decadbbde3 (patch) | |
| tree | 0563f158e0c3bbffdaee3b855896d5d7c6daf6bb | |
| parent | e78648db0a91269ed83238bfa3ced5d4d7dae2e0 (diff) | |
r300g: consolidate params
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 2a8667d4835..287664b1d20 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -83,6 +83,7 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) switch (param) { case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS: + case PIPE_CAP_MAX_COMBINED_SAMPLERS: /* XXX I'm told this goes up to 16 */ return 8; case PIPE_CAP_NPOT_TEXTURES: @@ -143,9 +144,11 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) case PIPE_CAP_BLEND_EQUATION_SEPARATE: return 1; case PIPE_CAP_SM3: - return 1; - case PIPE_CAP_MAX_COMBINED_SAMPLERS: - return 8; + if (r300screen->caps->is_r500) { + return 1; + } else { + return 0; + } default: debug_printf("r300: Implementation error: Bad param %d\n", param); |