Mesa (master): softpipe: disable vertex texturing with draw/llvm
Brian Paul
brianp at kemper.freedesktop.org
Fri Nov 5 20:47:56 UTC 2010
Module: Mesa
Branch: master
Commit: e82fddfcd3fe47016863dde3302767f31889d7d5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e82fddfcd3fe47016863dde3302767f31889d7d5
Author: Brian Paul <brianp at vmware.com>
Date: Fri Nov 5 14:40:33 2010 -0600
softpipe: disable vertex texturing with draw/llvm
This is a temporary work around to prevent crashes with glean/glsl1
(for example) which try to do vertex shader texturing.
---
src/gallium/drivers/softpipe/sp_screen.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index d90cf56..5f171d3 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -64,7 +64,12 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
return PIPE_MAX_SAMPLERS;
case PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS:
+#ifdef HAVE_LLVM
+ /* Softpipe doesn't yet know how to tell draw/llvm about textures */
+ return 0;
+#else
return PIPE_MAX_VERTEX_SAMPLERS;
+#endif
case PIPE_CAP_MAX_COMBINED_SAMPLERS:
return PIPE_MAX_SAMPLERS + PIPE_MAX_VERTEX_SAMPLERS;
case PIPE_CAP_NPOT_TEXTURES:
More information about the mesa-commit
mailing list