diff options
| author | Christoph Bumiller <[email protected]> | 2013-05-25 02:04:25 +0200 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-05-23 12:34:39 -0400 |
| commit | b9142c246dd383de6614ff0b96d017e18a3fdefd (patch) | |
| tree | bc76778e77f28154797abed5de46926ccfc0eef8 | |
| parent | d479713d25699c168af807ad36068691af11d0e0 (diff) | |
nv50,nvc0: handle guard band defines
[imirkin: moved default case out of switch]
Reviewed-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_screen.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 68d30ea2045..36a4ad1da09 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -286,10 +286,16 @@ nv50_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param) return 16.0f; case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS: return 4.0f; - default: - NOUVEAU_ERR("unknown PIPE_CAP %d\n", param); + case PIPE_CAPF_GUARD_BAND_LEFT: + case PIPE_CAPF_GUARD_BAND_TOP: return 0.0f; + case PIPE_CAPF_GUARD_BAND_RIGHT: + case PIPE_CAPF_GUARD_BAND_BOTTOM: + return 0.0f; /* that or infinity */ } + + NOUVEAU_ERR("unknown PIPE_CAPF %d\n", param); + return 0.0f; } static void diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index cccfe2bba23..9f89f3108b3 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -294,10 +294,16 @@ nvc0_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param) return 16.0f; case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS: return 15.0f; - default: - NOUVEAU_ERR("unknown PIPE_CAP %d\n", param); + case PIPE_CAPF_GUARD_BAND_LEFT: + case PIPE_CAPF_GUARD_BAND_TOP: return 0.0f; + case PIPE_CAPF_GUARD_BAND_RIGHT: + case PIPE_CAPF_GUARD_BAND_BOTTOM: + return 0.0f; /* that or infinity */ } + + NOUVEAU_ERR("unknown PIPE_CAPF %d\n", param); + return 0.0f; } static int |