commit c2c5f71e962d4035cea89e72fb782cc759a27a95
author Gert Wollny <gert.wollny@collabora.com> Tue Sep 22 09:20:41 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Sep 22 14:32:45 2020 +0000
tree 5b18ca21d54caf26ee0ebf4e9a73daef0c10b313
parent 44b45a38649e504ba46cd21a4a6ea2c6c15b4812

r600/sfn: Take dual source blending output indices into account

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6814>

src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp

diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
index 154bfb9..6fccf38 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_fragment.cpp
@@ -712,10 +712,8 @@
 }
 
 
-bool FragmentShaderFromNir::emit_export_pixel(const nir_variable *out_var, nir_intrinsic_instr* instr, bool all_chanels)
+bool FragmentShaderFromNir::emit_export_pixel(const nir_variable *out_var, nir_intrinsic_instr* instr, int outputs)
 {
-   int outputs = all_chanels ? m_max_color_exports : 1;
-
    std::array<uint32_t,4> swizzle;
    unsigned writemask = nir_intrinsic_write_mask(instr);
    switch (out_var->data.location) {
@@ -746,10 +744,14 @@
         out_var->data.location <= FRAG_RESULT_DATA7)) {
       for (int k = 0 ; k < outputs; ++k) {
 
-         unsigned location = out_var->data.driver_location + k - m_depth_exports;
+         unsigned location = (m_dual_source_blend ? out_var->data.index : out_var->data.driver_location) + k - m_depth_exports;
+
+         sfn_log << SfnLog::io << "Pixel output " << out_var->name << " at loc:" << location << "\n";
+
          if (location >= m_max_color_exports) {
-            sfn_log << SfnLog::io << "Pixel output " << location
-                    << " skipped  because  we have only "   << m_max_color_exports << "CBs\n";
+            sfn_log << SfnLog::io << "Pixel output loc:" << location
+                    << " dl:" << out_var->data.location
+                    << " skipped  because  we have only "   << m_max_color_exports << " CBs\n";
             continue;
          }