r600/sfn: drop store_deref handling for VS and TES

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

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 8ec3f289a79e34f2bca913ce1038f61f8297a811..294511336d1cad0669b02ec7c319a6939282503f 100644 (file)
--- 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 c52be4412f4f1c1df9696aa48bd9f6d9dd881c87..4b70799be2e1e4b9f12b505187a7cf693cdc43cd 100644 (file)
--- 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 6a9feb502929de3f10633a7687b5066f697ee341..4ba265a762c28c5efda31b0dd79e51f5ada9682d 100644 (file)
--- 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 b75d7ccfdd0e6c5570f96ae8a5e46295cbff5ed0..3bb9fb2b37a9c153f44701196347c1f9efc4258f 100644 (file)
--- 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);