radeonsi: use EXP_NULL for pixel shaders without outputs

This never happens currently.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 13e5140d4db1898d5946dc860e1c7f6292fe2d2c..4204db021287dc3cb37b5cb5327e159082e5f065 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2153,7 +2153,7 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base)
                args[0] = lp_build_const_int32(base->gallivm, 0x0); /* enabled channels */
                args[1] = uint->one; /* whether the EXEC mask is valid */
                args[2] = uint->one; /* DONE bit */
-               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_MRT);
+               args[3] = lp_build_const_int32(base->gallivm, V_008DFC_SQ_EXP_NULL);
                args[4] = uint->zero; /* COMPR flag (0 = 32-bit export) */
                args[5] = uint->undef; /* R */
                args[6] = uint->undef; /* G */

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 68ba7ec00b47ef454bb9791a5bfe84484bb125d5..af21f3e054cb56855a6e038c03ae5cba21dfbf7c 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -428,11 +428,8 @@ static void si_shader_ps(struct si_shader *shader)
        colors_written = info->colors_written;
        export_16bpc = shader->key.ps.export_16bpc;
 
-       if (!info->num_outputs) {
-               colors_written = 0x1; /* dummy export */
-               export_16bpc = 0;
-       } else if (info->colors_written == 0x1 &&
-                  info->properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS]) {
+       if (info->colors_written == 0x1 &&
+           info->properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS]) {
                colors_written |= (1 << (shader->key.ps.last_cbuf + 1)) - 1;
        }