r600/sfn: Unify semantic name and index query and use TEXCOORD semantic

[mesa.git] / src / gallium / drivers / r600 / sfn / sfn_vertexstageexport.cpp

diff --git a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
index 08c778a2e103853cb1f86d62ecd9747eca12a2e2..013603edbb6d9642f218cb949401aaa5c5c19ee2 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_vertexstageexport.cpp
@@ -1,6 +1,6 @@
 #include "sfn_vertexstageexport.h"
 
-#include "tgsi/tgsi_from_mesa.h"
+#include "sfn_shaderio.h"
 
 namespace r600 {
 
@@ -70,8 +70,9 @@ bool VertexStageExportBase::do_process_outputs(nir_variable *output)
        ) {
 
       r600_shader_io& io = m_proc.sh_info().output[output->data.driver_location];
-      tgsi_get_gl_varying_semantic(static_cast<gl_varying_slot>( output->data.location),
-                                   true, &io.name, &io.sid);
+      auto semantic = r600_get_varying_semantic(output->data.location);
+      io.name = semantic.first;
+      io.sid = semantic.second;
 
       m_proc.evaluate_spi_sid(io);
       io.write_mask = ((1 << glsl_get_components(output->type)) - 1)