X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_blend.c;h=1ffc2f1b73ff506e0456d380a96936328c130267;hb=02d12719e356ee9e3348db67ae55ae790dad058f;hp=f321cd38298b07185942d37b6f8b5de3516a8719;hpb=c8650b087440c7ba5ad0d8652dc916852e55bc1d;p=mesa.git

diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index f321cd38298..1ffc2f1b73f 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -33,19 +33,20 @@
  
 
 #include "st_context.h"
-#include "st_cache.h"
 #include "st_atom.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
+#include "cso_cache/cso_context.h"
 
+#include "main/macros.h"
 
 /**
  * Convert GLenum blend tokens to pipe tokens.
  * Both blend factors and blend funcs are accepted.
  */
 static GLuint
-gl_blend_to_sp(GLenum blend)
+translate_blend(GLenum blend)
 {
    switch (blend) {
    /* blend functions */
@@ -88,9 +89,9 @@ gl_blend_to_sp(GLenum blend)
    case GL_ONE_MINUS_SRC_ALPHA:
       return PIPE_BLENDFACTOR_INV_SRC_ALPHA;
    case GL_ONE_MINUS_DST_COLOR:
-      return PIPE_BLENDFACTOR_INV_DST_ALPHA;
-   case GL_ONE_MINUS_DST_ALPHA:
       return PIPE_BLENDFACTOR_INV_DST_COLOR;
+   case GL_ONE_MINUS_DST_ALPHA:
+      return PIPE_BLENDFACTOR_INV_DST_ALPHA;
    case GL_ONE_MINUS_CONSTANT_COLOR:
       return PIPE_BLENDFACTOR_INV_CONST_COLOR;
    case GL_ONE_MINUS_CONSTANT_ALPHA:
@@ -100,7 +101,7 @@ gl_blend_to_sp(GLenum blend)
       return PIPE_BLENDFACTOR_INV_SRC1_ALPHA;
       */
    default:
-      assert("invalid GL token in gl_blend_to_sp()" == NULL);
+      assert("invalid GL token in translate_blend()" == NULL);
       return 0;
    }
 }
@@ -110,7 +111,7 @@ gl_blend_to_sp(GLenum blend)
  * Convert GLenum logicop tokens to pipe tokens.
  */
 static GLuint
-gl_logicop_to_sp(GLenum logicop)
+translate_logicop(GLenum logicop)
 {
    switch (logicop) {
    case GL_CLEAR:
@@ -146,53 +147,104 @@ gl_logicop_to_sp(GLenum logicop)
    case GL_SET:
       return PIPE_LOGICOP_SET;
    default:
-      assert("invalid GL token in gl_logicop_to_sp()" == NULL);
+      assert("invalid GL token in translate_logicop()" == NULL);
       return 0;
    }
 }
 
+/**
+ * Figure out if colormasks are different per rt.
+ */
+static GLboolean
+colormask_per_rt(const struct gl_context *ctx)
+{
+   /* a bit suboptimal have to compare lots of values */
+   unsigned i;
+   for (i = 1; i < ctx->Const.MaxDrawBuffers; i++) {
+      if (memcmp(ctx->Color.ColorMask[0], ctx->Color.ColorMask[i], 4)) {
+         return GL_TRUE;
+      }
+   }
+   return GL_FALSE;
+}
+
+/**
+ * Figure out if blend enables/state are different per rt.
+ */
+static GLboolean
+blend_per_rt(const struct gl_context *ctx)
+{
+   if (ctx->Color.BlendEnabled &&
+      (ctx->Color.BlendEnabled != ((1 << ctx->Const.MaxDrawBuffers) - 1))) {
+      /* This can only happen if GL_EXT_draw_buffers2 is enabled */
+      return GL_TRUE;
+   }
+   if (ctx->Color._BlendFuncPerBuffer || ctx->Color._BlendEquationPerBuffer) {
+      /* this can only happen if GL_ARB_draw_buffers_blend is enabled */
+      return GL_TRUE;
+   }
+   return GL_FALSE;
+}
 
 static void 
 update_blend( struct st_context *st )
 {
-   struct pipe_blend_state blend;
-   const struct cso_blend *cso;
+   struct pipe_blend_state *blend = &st->state.blend;
+   const struct gl_context *ctx = st->ctx;
+   unsigned num_state = 1;
+   unsigned i, j;
 
-   memset(&blend, 0, sizeof(blend));
+   memset(blend, 0, sizeof(*blend));
 
-   if (st->ctx->Color.ColorLogicOpEnabled ||
-       (st->ctx->Color.BlendEnabled &&
-        st->ctx->Color.BlendEquationRGB == GL_LOGIC_OP)) {
+   if (blend_per_rt(ctx) || colormask_per_rt(ctx)) {
+      num_state = ctx->Const.MaxDrawBuffers;
+      blend->independent_blend_enable = 1;
+   }
+   if (ctx->Color.ColorLogicOpEnabled) {
       /* logicop enabled */
-      blend.logicop_enable = 1;
-      blend.logicop_func = gl_logicop_to_sp(st->ctx->Color.LogicOp);
+      blend->logicop_enable = 1;
+      blend->logicop_func = translate_logicop(ctx->Color.LogicOp);
    }
-   else if (st->ctx->Color.BlendEnabled) {
+   else if (ctx->Color.BlendEnabled) {
       /* blending enabled */
-      blend.blend_enable = 1;
-
-      blend.rgb_func = gl_blend_to_sp(st->ctx->Color.BlendEquationRGB);
-      if (st->ctx->Color.BlendEquationRGB == GL_MIN ||
-          st->ctx->Color.BlendEquationRGB == GL_MAX) {
-         /* Min/max are special */
-         blend.rgb_src_factor = PIPE_BLENDFACTOR_ONE;
-         blend.rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
-      }
-      else {
-         blend.rgb_src_factor = gl_blend_to_sp(st->ctx->Color.BlendSrcRGB);
-         blend.rgb_dst_factor = gl_blend_to_sp(st->ctx->Color.BlendDstRGB);
-      }
+      for (i = 0, j = 0; i < num_state; i++) {
 
-      blend.alpha_func = gl_blend_to_sp(st->ctx->Color.BlendEquationA);
-      if (st->ctx->Color.BlendEquationA == GL_MIN ||
-          st->ctx->Color.BlendEquationA == GL_MAX) {
-         /* Min/max are special */
-         blend.alpha_src_factor = PIPE_BLENDFACTOR_ONE;
-         blend.alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
-      }
-      else {
-         blend.alpha_src_factor = gl_blend_to_sp(st->ctx->Color.BlendSrcA);
-         blend.alpha_dst_factor = gl_blend_to_sp(st->ctx->Color.BlendDstA);
+         blend->rt[i].blend_enable = (ctx->Color.BlendEnabled >> i) & 0x1;
+
+         if (ctx->Extensions.ARB_draw_buffers_blend)
+            j = i;
+
+         blend->rt[i].rgb_func =
+            translate_blend(ctx->Color.Blend[j].EquationRGB);
+
+         if (ctx->Color.Blend[i].EquationRGB == GL_MIN ||
+             ctx->Color.Blend[i].EquationRGB == GL_MAX) {
+            /* Min/max are special */
+            blend->rt[i].rgb_src_factor = PIPE_BLENDFACTOR_ONE;
+            blend->rt[i].rgb_dst_factor = PIPE_BLENDFACTOR_ONE;
+         }
+         else {
+            blend->rt[i].rgb_src_factor =
+               translate_blend(ctx->Color.Blend[j].SrcRGB);
+            blend->rt[i].rgb_dst_factor =
+               translate_blend(ctx->Color.Blend[j].DstRGB);
+         }
+
+         blend->rt[i].alpha_func =
+            translate_blend(ctx->Color.Blend[j].EquationA);
+
+         if (ctx->Color.Blend[i].EquationA == GL_MIN ||
+             ctx->Color.Blend[i].EquationA == GL_MAX) {
+            /* Min/max are special */
+            blend->rt[i].alpha_src_factor = PIPE_BLENDFACTOR_ONE;
+            blend->rt[i].alpha_dst_factor = PIPE_BLENDFACTOR_ONE;
+         }
+         else {
+            blend->rt[i].alpha_src_factor =
+               translate_blend(ctx->Color.Blend[j].SrcA);
+            blend->rt[i].alpha_dst_factor =
+               translate_blend(ctx->Color.Blend[j].DstA);
+         }
       }
    }
    else {
@@ -200,48 +252,44 @@ update_blend( struct st_context *st )
    }
 
    /* Colormask - maybe reverse these bits? */
-   if (st->ctx->Color.ColorMask[0])
-      blend.colormask |= PIPE_MASK_R;
-   if (st->ctx->Color.ColorMask[1])
-      blend.colormask |= PIPE_MASK_G;
-   if (st->ctx->Color.ColorMask[2])
-      blend.colormask |= PIPE_MASK_B;
-   if (st->ctx->Color.ColorMask[3])
-      blend.colormask |= PIPE_MASK_A;
-
-   if (st->ctx->Color.DitherFlag)
-      blend.dither = 1;
-
-   cso = st_cached_blend_state(st, &blend);
-
-   if (st->state.blend != cso) {
-      /* state has changed */
-      st->state.blend = cso;
-      /* bind new state */
-      st->pipe->bind_blend_state(st->pipe, cso->data);
+   for (i = 0; i < num_state; i++) {
+      if (ctx->Color.ColorMask[i][0])
+         blend->rt[i].colormask |= PIPE_MASK_R;
+      if (ctx->Color.ColorMask[i][1])
+         blend->rt[i].colormask |= PIPE_MASK_G;
+      if (ctx->Color.ColorMask[i][2])
+         blend->rt[i].colormask |= PIPE_MASK_B;
+      if (ctx->Color.ColorMask[i][3])
+         blend->rt[i].colormask |= PIPE_MASK_A;
    }
 
-   if (memcmp(st->ctx->Color.BlendColor, &st->state.blend_color, 4 * sizeof(GLfloat)) != 0) {
-      /* state has changed */
-      st->state.blend_color.color[0] = st->ctx->Color.BlendColor[0];
-      st->state.blend_color.color[1] = st->ctx->Color.BlendColor[1];
-      st->state.blend_color.color[2] = st->ctx->Color.BlendColor[2];
-      st->state.blend_color.color[3] = st->ctx->Color.BlendColor[3];
-      st->pipe->set_blend_color(st->pipe, (struct pipe_blend_color *) st->ctx->Color.BlendColor);
+   if (ctx->Color.DitherFlag)
+      blend->dither = 1;
+
+   if (ctx->Multisample.Enabled) {
+      /* unlike in gallium/d3d10 these operations are only performed
+         if msaa is enabled */
+      if (ctx->Multisample.SampleAlphaToCoverage)
+         blend->alpha_to_coverage = 1;
+      if (ctx->Multisample.SampleAlphaToOne)
+         blend->alpha_to_one = 1;
+   }
+
+   cso_set_blend(st->cso_context, blend);
+
+   {
+      struct pipe_blend_color bc;
+      COPY_4FV(bc.color, ctx->Color.BlendColorUnclamped);
+      cso_set_blend_color(st->cso_context, &bc);
    }
 }
 
 
 const struct st_tracked_state st_update_blend = {
-   .name = "st_update_blend",
-   .dirty = {
-      .mesa = (_NEW_COLOR),  /* XXX _NEW_BLEND someday? */
-      .st  = 0,
+   "st_update_blend",					/* name */
+   {							/* dirty */
+      (_NEW_COLOR | _NEW_MULTISAMPLE),  /* XXX _NEW_BLEND someday? */	/* mesa */
+      0,						/* st */
    },
-   .update = update_blend
+   update_blend,					/* update */
 };
-
-
-
-
-