Mesa (master): r600/sfn: drop store_deref handling for VS and TES

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 81df5408ca1fb53e4c130c0f9fb23fe4d8eb0970
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=81df5408ca1fb53e4c130c0f9fb23fe4d8eb0970

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Tue Nov 24 21:26:33 2020 +0100

r600/sfn: drop store_deref handling for VS and TES

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

---

 src/gallium/drivers/r600/sfn/sfn_shader_tess_eval.cpp  |  2 +-
 src/gallium/drivers/r600/sfn/sfn_shader_vertex.cpp     |  2 +-
 src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp | 12 ------------
 src/gallium/drivers/r600/sfn/sfn_vertexstageexport.h   |  1 -
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_tess_eval.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_tess_eval.cpp
index 8ec3f289a79..294511336d1 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_tess_eval.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_tess_eval.cpp
@@ -143,7 +143,7 @@ bool TEvalShaderFromNir::do_process_outputs(nir_variable *output)
 
 bool TEvalShaderFromNir::do_emit_store_deref(const nir_variable *out_var, nir_intrinsic_instr* instr)
 {
-   return m_export_processor->store_deref(out_var, instr);
+   return false;
 }
 
 void TEvalShaderFromNir::do_finalize()
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_vertex.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_vertex.cpp
index c52be4412f4..4b70799be2e 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_vertex.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_vertex.cpp
@@ -230,7 +230,7 @@ void VertexShaderFromNir::do_finalize()
 
 bool VertexShaderFromNir::do_emit_store_deref(const nir_variable *out_var, nir_intrinsic_instr* instr)
 {
-   return m_export_processor->store_deref(out_var, instr);
+   return false;
 }
 
 }
diff --git a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
index 6a9feb50292..4ba265a762c 100644
--- a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
@@ -33,18 +33,6 @@ void VertexStageExportBase::scan_store_output(nir_intrinsic_instr* instr)
 
 }
 
-bool VertexStageExportBase::store_deref(const nir_variable *out_var, nir_intrinsic_instr* instr)
-{
-   const store_loc store_info  = {
-      out_var->data.location_frac,
-      (unsigned int)out_var->data.location,
-      out_var->data.driver_location,
-      1
-   };
-
-   return do_store_output(store_info, instr);
-}
-
 bool VertexStageExportBase::store_output(nir_intrinsic_instr* instr)
 {
    auto index = nir_src_as_const_value(instr->src[1]);
diff --git a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.h b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.h
index b75d7ccfdd0..3bb9fb2b37a 100644
--- a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.h
+++ b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.h
@@ -18,7 +18,6 @@ class VertexStageExportBase
 public:
    VertexStageExportBase(VertexStage& proc);
    virtual ~VertexStageExportBase();
-   virtual bool store_deref(const nir_variable *out_var, nir_intrinsic_instr* instr);
    virtual void finalize_exports() = 0;
    virtual bool do_process_outputs(nir_variable *output);