summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/softpipe/sp_context.h3
-rw-r--r--src/mesa/softpipe/sp_state.h15
-rw-r--r--src/mesa/softpipe/state_tracker/st_atom.c1
-rw-r--r--src/mesa/softpipe/state_tracker/st_atom.h1
-rw-r--r--src/mesa/softpipe/state_tracker/st_atom_blend.c202
5 files changed, 214 insertions, 8 deletions
diff --git a/src/mesa/softpipe/sp_context.h b/src/mesa/softpipe/sp_context.h
index a11ad26018..726cb96388 100644
--- a/src/mesa/softpipe/sp_context.h
+++ b/src/mesa/softpipe/sp_context.h
@@ -52,6 +52,9 @@ struct softpipe_context {
void (*set_scissor_rect)( struct softpipe_context *,
const struct softpipe_scissor_rect * );
+ void (*set_blend_state)( struct softpipe_context *,
+ const struct softpipe_blend_state * );
+
void (*set_fs_state)( struct softpipe_context *,
const struct softpipe_fs_state * );
diff --git a/src/mesa/softpipe/sp_state.h b/src/mesa/softpipe/sp_state.h
index f8521beed3..29bba916a1 100644
--- a/src/mesa/softpipe/sp_state.h
+++ b/src/mesa/softpipe/sp_state.h
@@ -102,18 +102,17 @@ struct softpipe_constant_buffer {
struct softpipe_blend_state {
GLuint blend_enable:1;
- GLuint ia_blend_enable:1;
- GLuint ia_dest_blend_factor:5;
- GLuint ia_src_blend_factor:5;
- GLuint ia_blend_function:3;
+ GLuint rgb_func:3;
+ GLuint rgb_src_factor:5;
+ GLuint rgb_dst_factor:5;
- GLuint dest_blend_factor:5;
- GLuint src_blend_factor:5;
- GLuint blend_function:3;
+ GLuint alpha_func:3;
+ GLuint alpha_src_factor:5;
+ GLuint alpha_dst_factor:5;
GLuint logicop_enable:1;
- GLuint logicop_func:4;
+ GLuint logicop_func:4;
};
struct softpipe_blend_color {
diff --git a/src/mesa/softpipe/state_tracker/st_atom.c b/src/mesa/softpipe/state_tracker/st_atom.c
index 1eb5c86e46..5f426f040a 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.c
+++ b/src/mesa/softpipe/state_tracker/st_atom.c
@@ -48,6 +48,7 @@ static const struct st_tracked_state *atoms[] =
&st_update_setup,
&st_update_viewport,
&st_update_scissor,
+ &st_update_blend,
/* will be patched out at runtime */
/* &st_update_constants */
};
diff --git a/src/mesa/softpipe/state_tracker/st_atom.h b/src/mesa/softpipe/state_tracker/st_atom.h
index ee3d36a00c..dc8397adce 100644
--- a/src/mesa/softpipe/state_tracker/st_atom.h
+++ b/src/mesa/softpipe/state_tracker/st_atom.h
@@ -51,6 +51,7 @@ const struct st_tracked_state st_update_setup;
const struct st_tracked_state st_update_viewport;
const struct st_tracked_state st_update_constants;
const struct st_tracked_state st_update_scissor;
+const struct st_tracked_state st_update_blend;
#endif
diff --git a/src/mesa/softpipe/state_tracker/st_atom_blend.c b/src/mesa/softpipe/state_tracker/st_atom_blend.c
new file mode 100644
index 0000000000..eabb9172ba
--- /dev/null
+++ b/src/mesa/softpipe/state_tracker/st_atom_blend.c
@@ -0,0 +1,202 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+ /*
+ * Authors:
+ * Keith Whitwell <keith@tungstengraphics.com>
+ * Brian Paul
+ */
+
+
+#include "st_context.h"
+#include "st_atom.h"
+#include "softpipe/sp_context.h"
+#include "softpipe/sp_defines.h"
+
+
+/**
+ * Convert GLenum blend tokens to softpipe tokens.
+ * Both blend factors and blend funcs are accepted.
+ */
+static GLuint
+gl_blend_to_sp(GLenum blend)
+{
+ switch (blend) {
+ /* blend functions */
+ case GL_FUNC_ADD:
+ return SP_BLEND_ADD;
+ case GL_FUNC_SUBTRACT:
+ return SP_BLEND_SUBTRACT;
+ case GL_FUNC_REVERSE_SUBTRACT:
+ return SP_BLEND_REVERSE_SUBTRACT;
+ case GL_MIN:
+ return SP_BLEND_MIN;
+ case GL_MAX:
+ return SP_BLEND_MAX;
+
+ /* blend factors */
+ case GL_ONE:
+ return SP_BLENDFACTOR_ONE;
+ case GL_SRC_COLOR:
+ return SP_BLENDFACTOR_SRC_COLOR;
+ case GL_SRC_ALPHA:
+ return SP_BLENDFACTOR_SRC_ALPHA;
+ case GL_DST_ALPHA:
+ return SP_BLENDFACTOR_DST_ALPHA;
+ case GL_DST_COLOR:
+ return SP_BLENDFACTOR_DST_COLOR;
+ case GL_SRC_ALPHA_SATURATE:
+ return SP_BLENDFACTOR_SRC_ALPHA_SATURATE;
+ case GL_CONSTANT_COLOR:
+ return SP_BLENDFACTOR_CONST_COLOR;
+ case GL_CONSTANT_ALPHA:
+ return SP_BLENDFACTOR_CONST_ALPHA;
+ /*
+ return SP_BLENDFACTOR_SRC1_COLOR;
+ return SP_BLENDFACTOR_SRC1_ALPHA;
+ */
+ case GL_ZERO:
+ return SP_BLENDFACTOR_ZERO;
+ case GL_ONE_MINUS_SRC_COLOR:
+ return SP_BLENDFACTOR_INV_SRC_COLOR;
+ case GL_ONE_MINUS_SRC_ALPHA:
+ return SP_BLENDFACTOR_INV_SRC_ALPHA;
+ case GL_ONE_MINUS_DST_COLOR:
+ return SP_BLENDFACTOR_INV_DST_ALPHA;
+ case GL_ONE_MINUS_DST_ALPHA:
+ return SP_BLENDFACTOR_INV_DST_COLOR;
+ case GL_ONE_MINUS_CONSTANT_COLOR:
+ return SP_BLENDFACTOR_INV_CONST_COLOR;
+ case GL_ONE_MINUS_CONSTANT_ALPHA:
+ return SP_BLENDFACTOR_INV_CONST_ALPHA;
+ /*
+ return SP_BLENDFACTOR_INV_SRC1_COLOR;
+ return SP_BLENDFACTOR_INV_SRC1_ALPHA;
+ */
+ default:
+ assert("invalid GL token in gl_blend_to_sp()" == NULL);
+ return 0;
+ }
+}
+
+
+/**
+ * Convert GLenum logicop tokens to softpipe tokens.
+ */
+static GLuint
+gl_logicop_to_sp(GLenum logicop)
+{
+ switch (logicop) {
+ case GL_CLEAR:
+ return SP_LOGICOP_CLEAR;
+ case GL_NOR:
+ return SP_LOGICOP_NOR;
+ case GL_AND_INVERTED:
+ return SP_LOGICOP_AND_INVERTED;
+ case GL_COPY_INVERTED:
+ return SP_LOGICOP_COPY_INVERTED;
+ case GL_AND_REVERSE:
+ return SP_LOGICOP_AND_REVERSE;
+ case GL_INVERT:
+ return SP_LOGICOP_INVERT;
+ case GL_XOR:
+ return SP_LOGICOP_XOR;
+ case GL_NAND:
+ return SP_LOGICOP_NAND;
+ case GL_AND:
+ return SP_LOGICOP_AND;
+ case GL_EQUIV:
+ return SP_LOGICOP_EQUIV;
+ case GL_NOOP:
+ return SP_LOGICOP_NOOP;
+ case GL_OR_INVERTED:
+ return SP_LOGICOP_OR_INVERTED;
+ case GL_COPY:
+ return SP_LOGICOP_COPY;
+ case GL_OR_REVERSE:
+ return SP_LOGICOP_OR_REVERSE;
+ case GL_OR:
+ return SP_LOGICOP_OR;
+ case GL_SET:
+ return SP_LOGICOP_SET;
+ default:
+ assert("invalid GL token in gl_logicop_to_sp()" == NULL);
+ return 0;
+ }
+}
+
+
+static void
+update_blend( struct st_context *st )
+{
+ struct softpipe_blend_state blend;
+
+ memset(&blend, 0, sizeof(blend));
+
+ if (st->ctx->Color.ColorLogicOpEnabled ||
+ (st->ctx->Color.BlendEnabled &&
+ st->ctx->Color.BlendEquationRGB == GL_LOGIC_OP)) {
+ /* logicop enabled */
+ blend.logicop_enable = 1;
+ blend.logicop_func = gl_logicop_to_sp(st->ctx->Color.LogicOp);
+ }
+ else if (st->ctx->Color.BlendEnabled) {
+ /* blending enabled */
+ blend.blend_enable = 1;
+
+ blend.rgb_func = gl_blend_to_sp(st->ctx->Color.BlendEquationRGB);
+ blend.rgb_src_factor = gl_blend_to_sp(st->ctx->Color.BlendSrcRGB);
+ blend.rgb_dst_factor = gl_blend_to_sp(st->ctx->Color.BlendDstRGB);
+
+ blend.alpha_func = gl_blend_to_sp(st->ctx->Color.BlendEquationA);
+ blend.alpha_src_factor = gl_blend_to_sp(st->ctx->Color.BlendSrcA);
+ blend.alpha_dst_factor = gl_blend_to_sp(st->ctx->Color.BlendDstA);
+ }
+ else {
+ /* no blending / logicop */
+ }
+
+ if (memcmp(&blend, &st->state.blend, sizeof(blend)) != 0) {
+ /* state has changed */
+ st->state.blend = blend; /* struct copy */
+ st->softpipe->set_blend_state(st->softpipe, &blend); /* set new state */
+ }
+}
+
+
+const struct st_tracked_state st_update_blend = {
+ .dirty = {
+ .mesa = (_NEW_COLOR), /* XXX _NEW_BLEND someday? */
+ .st = 0,
+ },
+ .update = update_blend
+};
+
+
+
+
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 21:42:47 +0000