Mesa (main): freedreno/a[345]xx: fix unorm/snorm blend factors when they're "over"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Nov 22 18:29:33 UTC 2021
Module: Mesa
Branch: main
Commit: bb6fb6065f335c1d8f8c8f977d36db3bb6f4909d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb6fb6065f335c1d8f8c8f977d36db3bb6f4909d
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Nov 21 13:40:38 2021 -0500
freedreno/a[345]xx: fix unorm/snorm blend factors when they're "over"
The float value may be out of range, so must be clamped to the allowed
range. Unclear if a3xx also has a SNORM factor that we're just missing
there, but that will be a separate investigation.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13903>
---
src/freedreno/ci/freedreno-a530-fails.txt | 4 ----
src/gallium/drivers/freedreno/a3xx/fd3_emit.c | 8 ++++----
src/gallium/drivers/freedreno/a4xx/fd4_emit.c | 16 ++++++++--------
src/gallium/drivers/freedreno/a5xx/fd5_emit.c | 16 ++++++++--------
4 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt
index 30b5dff236e..56e4b29b4f1 100644
--- a/src/freedreno/ci/freedreno-a530-fails.txt
+++ b/src/freedreno/ci/freedreno-a530-fails.txt
@@ -290,10 +290,6 @@ spec@!opengl 3.0 at clearbuffer-stencil,Fail
spec@!opengl 3.1 at primitive-restart-xfb generated,Fail
spec@!opengl 3.1 at primitive-restart-xfb written,Fail
spec@!opengl 3.1 at vao-broken-attrib,Crash
-spec at arb_color_buffer_float@gl_rgba8_snorm-render,Fail
-spec at arb_color_buffer_float@gl_rgba8_snorm-render-fog,Fail
-spec at arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail
-spec at arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail
spec at arb_depth_buffer_float@fbo-clear-formats stencil,Fail
spec at arb_depth_buffer_float@fbo-clear-formats stencil at GL_DEPTH32F_STENCIL8,Fail
spec at arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-blit,Fail
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index f661e6382f3..6a1b3960f7a 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
@@ -816,13 +816,13 @@ fd3_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
if (dirty & FD_DIRTY_BLEND_COLOR) {
struct pipe_blend_color *bcolor = &ctx->blend_color;
OUT_PKT0(ring, REG_A3XX_RB_BLEND_RED, 4);
- OUT_RING(ring, A3XX_RB_BLEND_RED_UINT(bcolor->color[0] * 255.0f) |
+ OUT_RING(ring, A3XX_RB_BLEND_RED_UINT(CLAMP(bcolor->color[0], 0.f, 1.f) * 0xff) |
A3XX_RB_BLEND_RED_FLOAT(bcolor->color[0]));
- OUT_RING(ring, A3XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * 255.0f) |
+ OUT_RING(ring, A3XX_RB_BLEND_GREEN_UINT(CLAMP(bcolor->color[1], 0.f, 1.f) * 0xff) |
A3XX_RB_BLEND_GREEN_FLOAT(bcolor->color[1]));
- OUT_RING(ring, A3XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * 255.0f) |
+ OUT_RING(ring, A3XX_RB_BLEND_BLUE_UINT(CLAMP(bcolor->color[2], 0.f, 1.f) * 0xff) |
A3XX_RB_BLEND_BLUE_FLOAT(bcolor->color[2]));
- OUT_RING(ring, A3XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * 255.0f) |
+ OUT_RING(ring, A3XX_RB_BLEND_ALPHA_UINT(CLAMP(bcolor->color[3], 0.f, 1.f) * 0xff) |
A3XX_RB_BLEND_ALPHA_FLOAT(bcolor->color[3]));
}
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index 8bfeb1877bc..e2ade51282f 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -754,20 +754,20 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
OUT_PKT0(ring, REG_A4XX_RB_BLEND_RED, 8);
OUT_RING(ring, A4XX_RB_BLEND_RED_FLOAT(bcolor->color[0]) |
- A4XX_RB_BLEND_RED_UINT(bcolor->color[0] * 0xff) |
- A4XX_RB_BLEND_RED_SINT(bcolor->color[0] * 0x7f));
+ A4XX_RB_BLEND_RED_UINT(CLAMP(bcolor->color[0], 0.f, 1.f) * 0xff) |
+ A4XX_RB_BLEND_RED_SINT(CLAMP(bcolor->color[0], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A4XX_RB_BLEND_RED_F32(bcolor->color[0]));
OUT_RING(ring, A4XX_RB_BLEND_GREEN_FLOAT(bcolor->color[1]) |
- A4XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * 0xff) |
- A4XX_RB_BLEND_GREEN_SINT(bcolor->color[1] * 0x7f));
+ A4XX_RB_BLEND_GREEN_UINT(CLAMP(bcolor->color[1], 0.f, 1.f) * 0xff) |
+ A4XX_RB_BLEND_GREEN_SINT(CLAMP(bcolor->color[1], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A4XX_RB_BLEND_RED_F32(bcolor->color[1]));
OUT_RING(ring, A4XX_RB_BLEND_BLUE_FLOAT(bcolor->color[2]) |
- A4XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * 0xff) |
- A4XX_RB_BLEND_BLUE_SINT(bcolor->color[2] * 0x7f));
+ A4XX_RB_BLEND_BLUE_UINT(CLAMP(bcolor->color[2], 0.f, 1.f) * 0xff) |
+ A4XX_RB_BLEND_BLUE_SINT(CLAMP(bcolor->color[2], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A4XX_RB_BLEND_BLUE_F32(bcolor->color[2]));
OUT_RING(ring, A4XX_RB_BLEND_ALPHA_FLOAT(bcolor->color[3]) |
- A4XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * 0xff) |
- A4XX_RB_BLEND_ALPHA_SINT(bcolor->color[3] * 0x7f));
+ A4XX_RB_BLEND_ALPHA_UINT(CLAMP(bcolor->color[3], 0.f, 1.f) * 0xff) |
+ A4XX_RB_BLEND_ALPHA_SINT(CLAMP(bcolor->color[3], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A4XX_RB_BLEND_ALPHA_F32(bcolor->color[3]));
}
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
index e37b47acf61..30b656a53ea 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
@@ -835,20 +835,20 @@ fd5_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
OUT_PKT4(ring, REG_A5XX_RB_BLEND_RED, 8);
OUT_RING(ring, A5XX_RB_BLEND_RED_FLOAT(bcolor->color[0]) |
- A5XX_RB_BLEND_RED_UINT(bcolor->color[0] * 0xff) |
- A5XX_RB_BLEND_RED_SINT(bcolor->color[0] * 0x7f));
+ A5XX_RB_BLEND_RED_UINT(CLAMP(bcolor->color[0], 0.f, 1.f) * 0xff) |
+ A5XX_RB_BLEND_RED_SINT(CLAMP(bcolor->color[0], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A5XX_RB_BLEND_RED_F32(bcolor->color[0]));
OUT_RING(ring, A5XX_RB_BLEND_GREEN_FLOAT(bcolor->color[1]) |
- A5XX_RB_BLEND_GREEN_UINT(bcolor->color[1] * 0xff) |
- A5XX_RB_BLEND_GREEN_SINT(bcolor->color[1] * 0x7f));
+ A5XX_RB_BLEND_GREEN_UINT(CLAMP(bcolor->color[1], 0.f, 1.f) * 0xff) |
+ A5XX_RB_BLEND_GREEN_SINT(CLAMP(bcolor->color[1], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A5XX_RB_BLEND_RED_F32(bcolor->color[1]));
OUT_RING(ring, A5XX_RB_BLEND_BLUE_FLOAT(bcolor->color[2]) |
- A5XX_RB_BLEND_BLUE_UINT(bcolor->color[2] * 0xff) |
- A5XX_RB_BLEND_BLUE_SINT(bcolor->color[2] * 0x7f));
+ A5XX_RB_BLEND_BLUE_UINT(CLAMP(bcolor->color[2], 0.f, 1.f) * 0xff) |
+ A5XX_RB_BLEND_BLUE_SINT(CLAMP(bcolor->color[2], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A5XX_RB_BLEND_BLUE_F32(bcolor->color[2]));
OUT_RING(ring, A5XX_RB_BLEND_ALPHA_FLOAT(bcolor->color[3]) |
- A5XX_RB_BLEND_ALPHA_UINT(bcolor->color[3] * 0xff) |
- A5XX_RB_BLEND_ALPHA_SINT(bcolor->color[3] * 0x7f));
+ A5XX_RB_BLEND_ALPHA_UINT(CLAMP(bcolor->color[3], 0.f, 1.f) * 0xff) |
+ A5XX_RB_BLEND_ALPHA_SINT(CLAMP(bcolor->color[3], -1.f, 1.f) * 0x7f));
OUT_RING(ring, A5XX_RB_BLEND_ALPHA_F32(bcolor->color[3]));
}
More information about the mesa-commit
mailing list