OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agx: Handle early_fragment_tests

Browse Source 
Simply doing nothing fixes
dEQP-GLES31.functional.image_load_store.early_fragment_tests.*. However, we need
to actually insert the sample_mask instruction to make sure the shader runs at
all (I think), doing that fixes:

   KHR-GLES31.core.shader_image_load_store.basic-glsl-earlyFragTests

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24258>
This commit is contained in:
Alyssa Rosenzweig
2023-05-29 20:34:50 -04:00
committed by Marge Bot
parent 76641762ce
commit a6ed776a13
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/asahi/compiler/agx_nir_lower_frag_sidefx.c
View File

@@ -14,9 +14,11 @@
* don't otherwise write their depth, forcing a late depth test. * don't otherwise write their depth, forcing a late depth test.
* *
* For side effects with force early testing forced, the sample mask is written * For side effects with force early testing forced, the sample mask is written
* at the *beginning* of the shader (TODO: handle). * at the *beginning* of the shader.
*/ */
#define ALL_SAMPLES (0xFF)
static void static void
insert_z_write(nir_builder *b) insert_z_write(nir_builder *b)
{ {
@@ -62,9 +64,26 @@ agx_nir_lower_frag_sidefx(nir_shader *s)
/* Lower writes from helper invocations with the common pass */ /* Lower writes from helper invocations with the common pass */
NIR_PASS_V(s, nir_lower_helper_writes, false); NIR_PASS_V(s, nir_lower_helper_writes, false);
bool writes_zs =
s->info.outputs_written &
(BITFIELD64_BIT(FRAG_RESULT_STENCIL) | BITFIELD64_BIT(FRAG_RESULT_DEPTH));
/* If the shader wants early fragment tests, trigger an early test at the
* beginning of the shader. This lets us use a Passthrough punch type,
* instead of Opaque which may result in the shader getting skipped
* incorrectly and then the side effects not kicking in.
*/
if (s->info.fs.early_fragment_tests) {
assert(!writes_zs && "incompatible");
nir_function_impl *impl = nir_shader_get_entrypoint(s);
nir_builder b = nir_builder_at(nir_before_cf_list(&impl->body));
nir_sample_mask_agx(&b, nir_imm_intN_t(&b, ALL_SAMPLES, 16),
nir_imm_intN_t(&b, ALL_SAMPLES, 16));
return true;
}
/* If depth/stencil feedback is already used, we're done */ /* If depth/stencil feedback is already used, we're done */
if (s->info.outputs_written & (BITFIELD64_BIT(FRAG_RESULT_STENCIL) | if (writes_zs)
BITFIELD64_BIT(FRAG_RESULT_DEPTH)))
return false; return false;
bool done = false; bool done = false;