Merge commit 'origin/perrtblend'

Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
2010-01-28 17:23:58 +01:00
parent bd60e6cd5c 2fa34bf44c
commit 9b346f83a7
56 changed files with 615 additions and 442 deletions
--- 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;
   }