diff options
| author | Brian Paul <[email protected]> | 2013-10-23 13:16:34 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-10-23 13:43:18 -0600 |
| commit | c1345720c86639bb570f3495b834916849d50e37 (patch) | |
| tree | 983a9271da4cd2699b079d6e9f3fc0c9df943e76 | |
| parent | ef98e2ee618f9452a3d16b8fb884d0318f7896fc (diff) | |
nv50: clamp PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS to PIPE_MAX_SAMPLERS
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70212
Tested-by: Aaron Watry <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index f454ec77656..a6bce342ccd 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -249,7 +249,7 @@ nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, case PIPE_SHADER_CAP_INTEGERS: return 1; case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS: - return 32; + return MIN2(32, PIPE_MAX_SAMPLERS); default: NOUVEAU_ERR("unknown PIPE_SHADER_CAP %d\n", param); return 0; |