diff options
| author | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
| commit | 195bbe8ce218533569dde1368d04da0fd229913d (patch) | |
| tree | 29d3db04673f59dcfd6663c524a5c1343d5cbee6 /src/gallium/drivers/softpipe/sp_screen.c | |
| parent | 99b57bc20e839043ec6160502814085a0976fccc (diff) | |
| parent | d67df5dd9db1cede92f1b177c890f83809bb4582 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_screen.c')
| -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 edc2a6dacf2..5e13d632387 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -65,7 +65,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: |