From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Nov 2010 20:40:33 +0000 (-0600)
Subject: softpipe: disable vertex texturing with draw/llvm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e82fddfcd3fe47016863dde3302767f31889d7d5;p=mesa.git

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.
---

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index d90cf56808c..5f171d314a3 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: