diff options
| author | Brian Paul <brianp@vmware.com> | 2010-11-05 14:40:33 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-11-05 14:41:40 -0600 |
| commit | e82fddfcd3fe47016863dde3302767f31889d7d5 (patch) | |
| tree | 57037e17f65345cd073c4b0523869c0647254a93 | |
| parent | 55c5408ad049423597cd274e7abcd2d91a16ead3 (diff) | |
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.
| -rw-r--r-- | 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 d90cf56808..5f171d314a 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: |