diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-01-28 17:23:58 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-01-28 17:23:58 +0100 |
| commit | 9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 (patch) | |
| tree | f5e4856c9d6fb4e57c4ddf6e64d5212f24c853ae /src/gallium/drivers/softpipe/sp_screen.c | |
| parent | bd60e6cd5ce7c19e52338f12f73dfa1b622391d5 (diff) | |
| parent | 2fa34bf44c7cd7ba03ce8a7e82fe56898a57e9b4 (diff) | |
Merge commit 'origin/perrtblend'
Conflicts:
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/include/pipe/p_defines.h
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_screen.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 69f40dc7b6..b2841f4103 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -95,6 +95,10 @@ softpipe_get_param(struct pipe_screen *screen, int param) return PIPE_MAX_CONSTANT_BUFFERS; case PIPE_CAP_MAX_CONST_BUFFER_SIZE: return 4096 * 4 * sizeof(float); + case PIPE_CAP_INDEP_BLEND_ENABLE: + return 1; + case PIPE_CAP_INDEP_BLEND_FUNC: + return 1; default: return 0; } |