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

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

diff --git a/src/gallium/drivers/r600/sfn/sfn_shaderio.cpp b/src/gallium/drivers/r600/sfn/sfn_shaderio.cpp
index 5526ab447c587febf569463dd2b5cd5ce8703e24..f32288e4de7ced1343e963db54c4660e28c3f88f 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_shaderio.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shaderio.cpp
@@ -196,6 +196,8 @@ void ShaderInputVarying::evaluate_spi_sid()
       assert(0 && "System value used as varying");
       break;
    case TGSI_SEMANTIC_GENERIC:
+   case TGSI_SEMANTIC_TEXCOORD:
+   case TGSI_SEMANTIC_PCOORD:
       m_spi_sid = m_sid + 1;
       break;
    default:
@@ -380,5 +382,22 @@ void ShaderIO::set_two_sided()
    m_two_sided = true;
 }
 
+std::pair<unsigned, unsigned>
+r600_get_varying_semantic(unsigned varying_location)
+{
+   std::pair<unsigned, unsigned> result;
+   tgsi_get_gl_varying_semantic(static_cast<gl_varying_slot>(varying_location),
+                                true, &result.first, &result.second);
+
+   if (result.first == TGSI_SEMANTIC_GENERIC) {
+      result.second += 9;
+   } else if (result.first == TGSI_SEMANTIC_PCOORD) {
+      result.second = 8;
+   }
+   return result;
+}
+
+
+
 }