summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gallium/auxiliary/util/u_screen.c1
-rw-r--r--src/gallium/docs/source/screen.rst1
-rw-r--r--src/gallium/include/pipe/p_defines.h1
-rw-r--r--src/mesa/main/fbobject.c4
-rw-r--r--src/mesa/main/mtypes.h1
-rw-r--r--src/mesa/state_tracker/st_atom_blend.c58
-rw-r--r--src/mesa/state_tracker/st_context.c4
-rw-r--r--src/mesa/state_tracker/st_context.h2
8 files changed, 70 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c
index 66dfa852540..c14edde8592 100644
--- a/src/gallium/auxiliary/util/u_screen.c
+++ b/src/gallium/auxiliary/util/u_screen.c
@@ -77,6 +77,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen,
case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
case PIPE_CAP_SEAMLESS_CUBE_MAP:
case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
+ case PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND:
return 0;
case PIPE_CAP_MIN_TEXEL_OFFSET:
diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index 14a769cc0ee..9b75a407db3 100644
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -482,6 +482,7 @@ The integer capabilities:
enable EXT_multisampled_render_to_texture.
* ``PIPE_CAP_TGSI_ATOMFADD``: Atomic floating point adds are supported on
images, buffers, and shared memory.
+* ``PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND``: True if the driver needs blend state to use zero/one instead of destination alpha for RGB/XRGB formats.
.. _pipe_capf:
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index d76fadadfdf..ae53c723c7e 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -853,6 +853,7 @@ enum pipe_cap
PIPE_CAP_SURFACE_SAMPLE_COUNT,
PIPE_CAP_TGSI_ATOMFADD,
PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE,
+ PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND,
};
/**
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 23e49396199..4ff00f273b5 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1003,6 +1003,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
fb->_HasSNormOrFloatColorBuffer = GL_FALSE;
fb->_HasAttachments = true;
fb->_IntegerBuffers = 0;
+ fb->_RGBBuffers = 0;
/* Start at -2 to more easily loop over all attachment points.
* -2: depth buffer
@@ -1149,6 +1150,9 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
if (_mesa_is_format_integer_color(attFormat))
fb->_IntegerBuffers |= (1 << i);
+ if (f == GL_RGB)
+ fb->_RGBBuffers |= (1 << i);
+
fb->_AllColorBuffersFixedPoint =
fb->_AllColorBuffersFixedPoint &&
(type == GL_UNSIGNED_NORMALIZED || type == GL_SIGNED_NORMALIZED);
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3d4673aa7e8..241c2b92f7a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3506,6 +3506,7 @@ struct gl_framebuffer
bool _HasAttachments;
GLbitfield _IntegerBuffers; /**< Which color buffers are integer valued */
+ GLbitfield _RGBBuffers; /**< Which color buffers have baseformat == RGB */
/* ARB_color_buffer_float */
GLboolean _AllColorBuffersFixedPoint; /* no integer, no float */
diff --git a/src/mesa/state_tracker/st_atom_blend.c b/src/mesa/state_tracker/st_atom_blend.c
index 9f7f779289e..a3ad037125b 100644
--- a/src/mesa/state_tracker/st_atom_blend.c
+++ b/src/mesa/state_tracker/st_atom_blend.c
@@ -41,6 +41,7 @@
#include "framebuffer.h"
#include "main/blend.h"
+#include "main/glformats.h"
#include "main/macros.h"
/**
@@ -126,8 +127,9 @@ colormask_per_rt(const struct gl_context *ctx, unsigned num_cb)
* Figure out if blend enables/state are different per rt.
*/
static GLboolean
-blend_per_rt(const struct gl_context *ctx, unsigned num_cb)
+blend_per_rt(const struct st_context *st, unsigned num_cb)
{
+ const struct gl_context *ctx = st->ctx;
GLbitfield cb_mask = u_bit_consecutive(0, num_cb);
GLbitfield blend_enabled = ctx->Color.BlendEnabled & cb_mask;
@@ -145,9 +147,49 @@ blend_per_rt(const struct gl_context *ctx, unsigned num_cb)
* must be handled on a per buffer basis. */
return GL_TRUE;
}
+
+ if (st->needs_rgb_dst_alpha_override && ctx->DrawBuffer->_RGBBuffers) {
+ /* Overriding requires independent blend functions (not just enables),
+ * require drivers exposing PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND to
+ * also expose PIPE_CAP_INDEP_BLEND_FUNC.
+ */
+ assert(st->has_indep_blend_func);
+
+ /* If some of the buffers are RGB, we may need to override blend
+ * factors that reference destination-alpha to constants. We may
+ * need different blend factor overrides per buffer (say one uses
+ * a DST_ALPHA factor and another uses INV_DST_ALPHA), so we flip
+ * on independent blending. This may not be required in all cases,
+ * but burning the CPU to figure it out is probably not worthwhile.
+ */
+ return GL_TRUE;
+ }
+
return GL_FALSE;
}
+/**
+ * Modify blend function to force destination alpha to 1.0
+ *
+ * If \c function specifies a blend function that uses destination alpha,
+ * replace it with a function that hard-wires destination alpha to 1.0.
+ * This is useful when emulating a GL RGB format with an RGBA pipe_format.
+ */
+static enum pipe_blendfactor
+fix_xrgb_alpha(enum pipe_blendfactor factor)
+{
+ switch (factor) {
+ case PIPE_BLENDFACTOR_DST_ALPHA:
+ return PIPE_BLENDFACTOR_ONE;
+
+ case PIPE_BLENDFACTOR_INV_DST_ALPHA:
+ case PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE:
+ return PIPE_BLENDFACTOR_ZERO;
+ default:
+ return factor;
+ }
+}
+
void
st_update_blend( struct st_context *st )
{
@@ -160,7 +202,7 @@ st_update_blend( struct st_context *st )
memset(blend, 0, sizeof(*blend));
if (num_cb > 1 &&
- (blend_per_rt(ctx, num_cb) || colormask_per_rt(ctx, num_cb))) {
+ (blend_per_rt(st, num_cb) || colormask_per_rt(ctx, num_cb))) {
num_state = num_cb;
blend->independent_blend_enable = 1;
}
@@ -216,6 +258,18 @@ st_update_blend( struct st_context *st )
blend->rt[i].alpha_dst_factor =
translate_blend(ctx->Color.Blend[j].DstA);
}
+
+ const struct gl_renderbuffer *rb =
+ ctx->DrawBuffer->_ColorDrawBuffers[i];
+
+ if (st->needs_rgb_dst_alpha_override && rb &&
+ (ctx->DrawBuffer->_RGBBuffers & (1 << i))) {
+ struct pipe_rt_blend_state *rt = &blend->rt[i];
+ rt->rgb_src_factor = fix_xrgb_alpha(rt->rgb_src_factor);
+ rt->rgb_dst_factor = fix_xrgb_alpha(rt->rgb_dst_factor);
+ rt->alpha_src_factor = fix_xrgb_alpha(rt->alpha_src_factor);
+ rt->alpha_dst_factor = fix_xrgb_alpha(rt->alpha_dst_factor);
+ }
}
}
else {
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 30380446041..0a0bd8ba1ca 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -464,6 +464,10 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
screen->get_param(screen, PIPE_CAP_MULTI_DRAW_INDIRECT);
st->has_single_pipe_stat =
screen->get_param(screen, PIPE_CAP_QUERY_PIPELINE_STATISTICS_SINGLE);
+ st->has_indep_blend_func =
+ screen->get_param(screen, PIPE_CAP_INDEP_BLEND_FUNC);
+ st->needs_rgb_dst_alpha_override =
+ screen->get_param(screen, PIPE_CAP_RGB_OVERRIDE_DST_ALPHA_BLEND);
st->has_hw_atomics =
screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT,
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 8b736ebff75..ed69e3d4873 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -128,6 +128,8 @@ struct st_context
boolean has_half_float_packing;
boolean has_multi_draw_indirect;
boolean has_single_pipe_stat;
+ boolean has_indep_blend_func;
+ boolean needs_rgb_dst_alpha_override;
boolean can_bind_const_buffer_as_vertex;
/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 16:57:15 +0000