Various fixes to gfx. (#2120)

* Various fixes to gfx.

* Fix.

* Fixes.

* Fix.

Co-authored-by: Yong He <yhe@nvidia.com>

7 files changed, 12 insertions, 11 deletions

diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp
index 31313830f..d8f680376 100644
--- a/examples/gpu-printing/main.cpp
+++ b/examples/gpu-printing/main.cpp
@@ -73,7 +73,7 @@ ComPtr<gfx::IShaderProgram> loadComputeProgram(slang::IModule* slangModule, char
     gGPUPrinting.loadStrings(linkedProgram->getLayout());
 
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = linkedProgram;
+    programDesc.slangGlobalScope = linkedProgram;
 
     auto shaderProgram = gDevice->createProgram(programDesc);
 
@@ -113,7 +113,7 @@ Result execute()
 
     IResourceView::Desc printBufferViewDesc;
     printBufferViewDesc.type = IResourceView::Type::UnorderedAccess;
-    auto printBufferView = gDevice->createBufferView(printBuffer, printBufferViewDesc);
+    auto printBufferView = gDevice->createBufferView(printBuffer, nullptr, printBufferViewDesc);
 
     ITransientResourceHeap::Desc transientResourceHeapDesc = {};
     transientResourceHeapDesc.constantBufferSize = 256;
diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp
index dcc1a975f..3b278fede 100644
--- a/examples/model-viewer/main.cpp
+++ b/examples/model-viewer/main.cpp
@@ -108,7 +108,7 @@ struct RendererContext
         // We can create a `gfx::IShaderProgram` object from `composedProgram`
         // so it may be used by the graphics layer.
         gfx::IShaderProgram::Desc programDesc = {};
-        programDesc.slangProgram = composedProgram.get();
+        programDesc.slangGlobalScope = composedProgram.get();
 
         shaderProgram = device->createProgram(programDesc);
 
diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp
index 9b01d251c..9e00ccf67 100644
--- a/examples/ray-tracing-pipeline/main.cpp
+++ b/examples/ray-tracing-pipeline/main.cpp
@@ -201,7 +201,7 @@ gfx::Result loadShaderProgram(
     SLANG_RETURN_ON_FAIL(result);
 
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = linkedProgram;
+    programDesc.slangGlobalScope = linkedProgram;
     SLANG_RETURN_ON_FAIL(device->createProgram(programDesc, outProgram));
 
     return SLANG_OK;
@@ -327,7 +327,7 @@ Slang::Result initialize()
     primitiveSRVDesc.format = Format::Unknown;
     primitiveSRVDesc.type = IResourceView::Type::ShaderResource;
     primitiveSRVDesc.bufferElementSize = sizeof(Primitive);
-    gPrimitiveBufferSRV = gDevice->createBufferView(gPrimitiveBuffer, primitiveSRVDesc);
+    gPrimitiveBufferSRV = gDevice->createBufferView(gPrimitiveBuffer, nullptr, primitiveSRVDesc);
 
     IBufferResource::Desc transformBufferDesc;
     transformBufferDesc.type = IResource::Type::Buffer;
diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp
index 9d6a638d4..82ad01c95 100644
--- a/examples/ray-tracing/main.cpp
+++ b/examples/ray-tracing/main.cpp
@@ -193,7 +193,7 @@ gfx::Result loadShaderProgram(
     SLANG_RETURN_ON_FAIL(result);
 
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = linkedProgram;
+    programDesc.slangGlobalScope = linkedProgram;
     SLANG_RETURN_ON_FAIL(device->createProgram(programDesc, outProgram));
 
     return SLANG_OK;
@@ -318,7 +318,7 @@ Slang::Result initialize()
     primitiveSRVDesc.format = Format::Unknown;
     primitiveSRVDesc.type = IResourceView::Type::ShaderResource;
     primitiveSRVDesc.bufferElementSize = sizeof(Primitive);
-    gPrimitiveBufferSRV = gDevice->createBufferView(gPrimitiveBuffer, primitiveSRVDesc);
+    gPrimitiveBufferSRV = gDevice->createBufferView(gPrimitiveBuffer, nullptr, primitiveSRVDesc);
 
     IBufferResource::Desc transformBufferDesc;
     transformBufferDesc.type = IResource::Type::Buffer;
diff --git a/examples/shader-object/main.cpp b/examples/shader-object/main.cpp
index 58c6abbfd..7c72194d3 100644
--- a/examples/shader-object/main.cpp
+++ b/examples/shader-object/main.cpp
@@ -120,7 +120,7 @@ Result loadShaderProgram(
     // We can create a `gfx::IShaderProgram` object from `composedProgram`
     // so it may be used by the graphics layer.
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = composedProgram.get();
+    programDesc.slangGlobalScope = composedProgram.get();
 
     auto shaderProgram = device->createProgram(programDesc);
 
@@ -183,7 +183,8 @@ int main()
     gfx::IResourceView::Desc viewDesc = {};
     viewDesc.type = gfx::IResourceView::Type::UnorderedAccess;
     viewDesc.format = gfx::Format::Unknown;
-    SLANG_RETURN_ON_FAIL(device->createBufferView(numbersBuffer, viewDesc, bufferView.writeRef()));
+    SLANG_RETURN_ON_FAIL(
+        device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef()));
 
     // We have done all the set up work, now it is time to start recording a command buffer for
     // GPU execution.
diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp
index 879330aca..ec161aee8 100644
--- a/examples/shader-toy/main.cpp
+++ b/examples/shader-toy/main.cpp
@@ -263,7 +263,7 @@ Result loadShaderProgram(gfx::IDevice* device, ComPtr<gfx::IShaderProgram>& outS
     SLANG_RETURN_ON_FAIL(result);
 
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = linkedProgram.get();
+    programDesc.slangGlobalScope = linkedProgram.get();
     auto shaderProgram = device->createProgram(programDesc);
     outShaderProgram = shaderProgram;
     return SLANG_OK;
diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp
index a81a105ab..bd6542b38 100644
--- a/examples/triangle/main.cpp
+++ b/examples/triangle/main.cpp
@@ -181,7 +181,7 @@ gfx::Result loadShaderProgram(
     // program representation.
     //
     gfx::IShaderProgram::Desc programDesc = {};
-    programDesc.slangProgram = linkedProgram;
+    programDesc.slangGlobalScope = linkedProgram;
     SLANG_RETURN_ON_FAIL(device->createProgram(programDesc, outProgram));
 
     return SLANG_OK;