Generate native resource binding map for MSL

Task-number: QTBUG-79368
Change-Id: I74f6bdab13e5ee0f7c97e78e776f59e191af2fdb
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

3 files changed, 33 insertions, 4 deletions

diff --git a/src/shadertools/qshaderbaker.cpp b/src/shadertools/qshaderbaker.cpp
index df30436..700901f 100644
--- a/src/shadertools/qshaderbaker.cpp
+++ b/src/shadertools/qshaderbaker.cpp
@@ -420,12 +420,16 @@ QShader QShaderBaker::bake()
                 }
                 break;
             case QShader::MslShader:
-                shader.setShader(currentSpirvShader->translateToMSL(req.second.version()));
+            {
+                QShader::NativeResourceBindingMap nativeBindings;
+                shader.setShader(currentSpirvShader->translateToMSL(req.second.version(), &nativeBindings));
                 if (shader.shader().isEmpty()) {
                     d->errorMessage = currentSpirvShader->translationErrorMessage();
                     return QShader();
                 }
                 shader.setEntryPoint(QByteArrayLiteral("main0"));
+                bs.setResourceBindingMap(key, nativeBindings);
+            }
                 break;
             default:
                 Q_UNREACHABLE();
diff --git a/src/shadertools/qspirvshader.cpp b/src/shadertools/qspirvshader.cpp
index 88c8702..7900359 100644
--- a/src/shadertools/qspirvshader.cpp
+++ b/src/shadertools/qspirvshader.cpp
@@ -500,7 +500,7 @@ QByteArray QSpirvShader::translateToHLSL(int version) const
     }
 }
 
-QByteArray QSpirvShader::translateToMSL(int version) const
+QByteArray QSpirvShader::translateToMSL(int version, QShader::NativeResourceBindingMap *nativeBindings) const
 {
     d->spirvCrossErrorMsg.clear();
 
@@ -515,6 +515,31 @@ QByteArray QSpirvShader::translateToMSL(int version) const
 
         const std::string msl = d->mslGen->compile();
 
+        if (nativeBindings) {
+            spirv_cross::ShaderResources resources = d->mslGen->get_shader_resources();
+            for (const spirv_cross::Resource &r : resources.uniform_buffers) {
+                uint32_t binding = d->mslGen->get_decoration(r.id, spv::DecorationBinding);
+                uint32_t nativeBinding = d->mslGen->get_automatic_msl_resource_binding(r.id);
+                nativeBindings->insert(int(binding), { int(nativeBinding), 0 });
+            }
+            for (const spirv_cross::Resource &r : resources.storage_buffers) {
+                uint32_t binding = d->mslGen->get_decoration(r.id, spv::DecorationBinding);
+                uint32_t nativeBinding = d->mslGen->get_automatic_msl_resource_binding(r.id);
+                nativeBindings->insert(int(binding), { int(nativeBinding), 0 });
+            }
+            for (const spirv_cross::Resource &r : resources.sampled_images) {
+                uint32_t binding = d->mslGen->get_decoration(r.id, spv::DecorationBinding);
+                uint32_t nativeTextureBinding = d->mslGen->get_automatic_msl_resource_binding(r.id);
+                uint32_t nativeSamplerBinding = d->mslGen->get_automatic_msl_resource_binding_secondary(r.id);
+                nativeBindings->insert(int(binding), { int(nativeTextureBinding), int(nativeSamplerBinding) });
+            }
+            for (const spirv_cross::Resource &r : resources.storage_images) {
+                uint32_t binding = d->mslGen->get_decoration(r.id, spv::DecorationBinding);
+                uint32_t nativeBinding = d->mslGen->get_automatic_msl_resource_binding(r.id);
+                nativeBindings->insert(int(binding), { int(nativeBinding), 0 });
+            }
+        }
+
         return QByteArray::fromStdString(msl);
     } catch (const std::runtime_error &e) {
         d->spirvCrossErrorMsg = QString::fromUtf8(e.what());
diff --git a/src/shadertools/qspirvshader_p.h b/src/shadertools/qspirvshader_p.h
index 018fc30..b00a30e 100644
--- a/src/shadertools/qspirvshader_p.h
+++ b/src/shadertools/qspirvshader_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtShaderTools/private/qtshadertoolsglobal_p.h>
-#include <QtGui/private/qshaderdescription_p.h>
+#include <QtGui/private/qshader_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -84,7 +84,7 @@ public:
 
     QByteArray translateToGLSL(int version = 120, GlslFlags flags = GlslFlags()) const;
     QByteArray translateToHLSL(int version = 50) const;
-    QByteArray translateToMSL(int version = 12) const;
+    QByteArray translateToMSL(int version = 12, QShader::NativeResourceBindingMap *nativeBindings = nullptr) const;
 
     QString translationErrorMessage() const;