From f4e2b2264663482f76681dbc0a8e9fc1574a3ce7 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 26 Feb 2023 17:26:34 -0500 Subject: [PATCH] asahi: Advertise dual-source blending This is handled entirely in common code. Signed-off-by: Alyssa Rosenzweig Part-of: --- docs/features.txt | 2 +- src/asahi/lib/agx_nir_lower_tilebuffer.c | 2 +- src/gallium/drivers/asahi/agx_pipe.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index f94725182cb..3e56e6bf88d 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -99,7 +99,7 @@ GL 3.2, GLSL 1.50 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv GL 3.3, GLSL 3.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, virgl, zink, d3d12 - GL_ARB_blend_func_extended DONE (freedreno/a3xx, freedreno/a6xx, panfrost, lima) + GL_ARB_blend_func_extended DONE (freedreno/a3xx, freedreno/a6xx, panfrost, lima, asahi) GL_ARB_explicit_attrib_location DONE (all drivers that support GLSL) GL_ARB_occlusion_query2 DONE (v3d, panfrost, asahi) GL_ARB_sampler_objects DONE (all drivers) diff --git a/src/asahi/lib/agx_nir_lower_tilebuffer.c b/src/asahi/lib/agx_nir_lower_tilebuffer.c index 43a295b413f..ea6ed244772 100644 --- a/src/asahi/lib/agx_nir_lower_tilebuffer.c +++ b/src/asahi/lib/agx_nir_lower_tilebuffer.c @@ -29,7 +29,7 @@ tib_filter(const nir_instr *instr, UNUSED const void *_) return false; nir_io_semantics sem = nir_intrinsic_io_semantics(intr); - assert(sem.dual_source_blend_index == 0 && "todo: dual source blending"); + assert(sem.dual_source_blend_index == 0 && "dual source blending lowered"); return (sem.location >= FRAG_RESULT_DATA0); } diff --git a/src/gallium/drivers/asahi/agx_pipe.c b/src/gallium/drivers/asahi/agx_pipe.c index 18961f8b258..1643ec080f5 100644 --- a/src/gallium/drivers/asahi/agx_pipe.c +++ b/src/gallium/drivers/asahi/agx_pipe.c @@ -1243,9 +1243,8 @@ agx_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FBFETCH: case PIPE_CAP_FBFETCH_COHERENT: return 8; - case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: - return 0; + return 1; case PIPE_CAP_OCCLUSION_QUERY: case PIPE_CAP_PRIMITIVE_RESTART: