summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-10-14 14:59:15 +0200
committerMarek Olšák <[email protected]>2011-10-14 15:06:01 +0200
commitae272a92a17510493392d7d7dd4937786af415ec (patch)
tree0bd463510eaa3724fadf520790b0ee4685913d48
parent5dddeb7776c62b6218add3a236551cde876b1cf0 (diff)
r300g: set max vertex samplers to 0 on swtcl chipsets
This should fix a bug added by f5bfe54a. Might also fix: https://bugs.freedesktop.org/show_bug.cgi?id=41715
-rw-r--r--src/gallium/drivers/r300/r300_screen.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 19489bdab24..c574a504924 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -225,6 +225,13 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
}
break;
case PIPE_SHADER_VERTEX:
+ switch (param)
+ {
+ case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
+ return 0;
+ default:;
+ }
+
if (!r300screen->caps.has_tcl) {
return draw_get_shader_param(shader, param);
}
@@ -259,12 +266,10 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
case PIPE_SHADER_CAP_SUBROUTINES:
case PIPE_SHADER_CAP_INTEGERS:
- case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
return 0;
+ default:;
}
break;
- default:
- break;
}
return 0;
}