diff options
| author | David Heidelberg <[email protected]> | 2014-12-28 01:11:14 +0100 |
|---|---|---|
| committer | David Heidelberg <[email protected]> | 2015-02-06 18:27:30 +0100 |
| commit | bae23a1756c361dd74b97be6c9d4762bca4ca81a (patch) | |
| tree | f4d2db1d517f876b1270edf8a8b1796005907e32 /src/gallium/drivers/r300/r300_screen.c | |
| parent | 71a36e0a2c0f301aa83989dc4ade700a9751493d (diff) | |
r300g: small code cleanup (v2)
v2: incorporated changes from Marek Olšák
Reviewed-by: Marek Olšák <[email protected]>
Signed-off-by: David Heidelberg <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 640d54723bf..7794fc26cd9 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -271,7 +271,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e case PIPE_SHADER_CAP_MAX_TEMPS: return is_r500 ? 128 : is_r400 ? 64 : 32; case PIPE_SHADER_CAP_MAX_PREDS: - return is_r500 ? 1 : 0; + return 0; /* unused */ case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS: return r300screen->caps.num_tex_units; @@ -321,7 +321,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e case PIPE_SHADER_CAP_MAX_TEMPS: return 32; case PIPE_SHADER_CAP_MAX_PREDS: - return is_r500 ? 4 : 0; /* XXX guessed. */ + return 0; /* unused */ case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR: return 1; case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS: @@ -372,8 +372,6 @@ static float r300_get_paramf(struct pipe_screen* pscreen, case PIPE_CAPF_GUARD_BAND_TOP: case PIPE_CAPF_GUARD_BAND_RIGHT: case PIPE_CAPF_GUARD_BAND_BOTTOM: - /* XXX I don't know what these should be but the least we can do is - * silence the potential error message */ return 0.0f; default: debug_printf("r300: Warning: Unknown CAP %d in get_paramf.\n", |