3636#include " gfx/d3d11/render-d3d11.h"
3737#include " tools/graphics-app-framework/window.h"
3838#include " slang-com-ptr.h"
39+ #include " source/core/slang-basic.h"
3940
4041using namespace gfx ;
42+ using namespace Slang ;
4143
4244// For the purposes of a small example, we will define the vertex data for a
4345// single triangle directly in the source file. It should be easy to extend
@@ -72,7 +74,7 @@ struct HelloWorld
7274// Slang API. This function is representative of code that a user
7375// might write to integrate Slang into their renderer/engine.
7476//
75- RefPtr <gfx::ShaderProgram > loadShaderProgram (gfx::IRenderer* renderer)
77+ ComPtr <gfx::IShaderProgram > loadShaderProgram (gfx::IRenderer* renderer)
7678{
7779 // First, we need to create a "session" for interacting with the Slang
7880 // compiler. This scopes all of our application's interactions
@@ -183,13 +185,13 @@ RefPtr<gfx::ShaderProgram> loadShaderProgram(gfx::IRenderer* renderer)
183185 // Reminder: this section does not involve the Slang API at all.
184186 //
185187
186- gfx::ShaderProgram ::KernelDesc kernelDescs[] =
188+ gfx::IShaderProgram ::KernelDesc kernelDescs[] =
187189 {
188190 { gfx::StageType::Vertex, vertexCode, vertexCodeEnd },
189191 { gfx::StageType::Fragment, fragmentCode, fragmentCodeEnd },
190192 };
191193
192- gfx::ShaderProgram ::Desc programDesc;
194+ gfx::IShaderProgram ::Desc programDesc;
193195 programDesc.pipelineType = gfx::PipelineType::Graphics;
194196 programDesc.kernels = &kernelDescs[0 ];
195197 programDesc.kernelCount = 2 ;
@@ -230,19 +232,19 @@ int gWindowHeight = 768;
230232gfx::ApplicationContext* gAppContext ;
231233gfx::Window* gWindow ;
232234Slang::ComPtr<gfx::IRenderer> gRenderer ;
233- RefPtr <gfx::BufferResource > gConstantBuffer ;
235+ ComPtr <gfx::IBufferResource > gConstantBuffer ;
234236
235- RefPtr <gfx::PipelineLayout > gPipelineLayout ;
236- RefPtr <gfx::PipelineState> gPipelineState ;
237- RefPtr <gfx::DescriptorSet> gDescriptorSet ;
237+ ComPtr <gfx::IPipelineLayout > gPipelineLayout ;
238+ ComPtr <gfx::IPipelineState> gPipelineState ;
239+ ComPtr <gfx::IDescriptorSet> gDescriptorSet ;
238240
239- RefPtr <gfx::BufferResource > gVertexBuffer ;
241+ ComPtr <gfx::IBufferResource > gVertexBuffer ;
240242
241243// Now that we've covered the function that actually loads and
242244// compiles our Slang shade code, we can go through the rest
243245// of the application code without as much commentary.
244246//
245- Result initialize ()
247+ Slang:: Result initialize ()
246248{
247249 // Create a window for our application to render into.
248250 //
@@ -264,7 +266,7 @@ Result initialize()
264266 rendererDesc.width = gWindowWidth ;
265267 rendererDesc.height = gWindowHeight ;
266268 {
267- Result res = gRenderer ->initialize (rendererDesc, getPlatformWindowHandle (gWindow ));
269+ gfx:: Result res = gRenderer ->initialize (rendererDesc, getPlatformWindowHandle (gWindow ));
268270 if (SLANG_FAILED (res)) return res;
269271 }
270272
@@ -278,13 +280,13 @@ Result initialize()
278280 //
279281 int constantBufferSize = 16 * sizeof (float );
280282
281- BufferResource ::Desc constantBufferDesc;
283+ IBufferResource ::Desc constantBufferDesc;
282284 constantBufferDesc.init (constantBufferSize);
283- constantBufferDesc.setDefaults (Resource ::Usage::ConstantBuffer);
284- constantBufferDesc.cpuAccessFlags = Resource ::AccessFlag::Write;
285+ constantBufferDesc.setDefaults (IResource ::Usage::ConstantBuffer);
286+ constantBufferDesc.cpuAccessFlags = IResource ::AccessFlag::Write;
285287
286288 gConstantBuffer = gRenderer ->createBufferResource (
287- Resource ::Usage::ConstantBuffer,
289+ IResource ::Usage::ConstantBuffer,
288290 constantBufferDesc);
289291 if (!gConstantBuffer ) return SLANG_FAIL;
290292
@@ -305,19 +307,19 @@ Result initialize()
305307 // Next we allocate a vertex buffer for our pre-initialized
306308 // vertex data.
307309 //
308- BufferResource ::Desc vertexBufferDesc;
310+ IBufferResource ::Desc vertexBufferDesc;
309311 vertexBufferDesc.init (kVertexCount * sizeof (Vertex));
310- vertexBufferDesc.setDefaults (Resource ::Usage::VertexBuffer);
312+ vertexBufferDesc.setDefaults (IResource ::Usage::VertexBuffer);
311313 gVertexBuffer = gRenderer ->createBufferResource (
312- Resource ::Usage::VertexBuffer,
314+ IResource ::Usage::VertexBuffer,
313315 vertexBufferDesc,
314316 &kVertexData [0 ]);
315317 if (!gVertexBuffer ) return SLANG_FAIL;
316318
317319 // Now we will use our `loadShaderProgram` function to load
318320 // the code from `shaders.slang` into the graphics API.
319321 //
320- RefPtr<ShaderProgram > shaderProgram = loadShaderProgram (gRenderer );
322+ ComPtr<IShaderProgram > shaderProgram = loadShaderProgram (gRenderer );
321323 if (!shaderProgram) return SLANG_FAIL;
322324
323325 // Our example graphics API usess a "modern" D3D12/Vulkan style
@@ -326,11 +328,11 @@ Result initialize()
326328 //
327329 // First, we need to construct a descriptor set *layout*.
328330 //
329- DescriptorSetLayout ::SlotRangeDesc slotRanges[] =
331+ IDescriptorSetLayout ::SlotRangeDesc slotRanges[] =
330332 {
331- DescriptorSetLayout ::SlotRangeDesc
333+ IDescriptorSetLayout ::SlotRangeDesc
332334 };
333- DescriptorSetLayout ::Desc descriptorSetLayoutDesc;
335+ IDescriptorSetLayout ::Desc descriptorSetLayoutDesc;
334336 descriptorSetLayoutDesc.slotRangeCount = 1 ;
335337 descriptorSetLayoutDesc.slotRanges = &slotRanges[0 ];
336338 auto descriptorSetLayout = gRenderer ->createDescriptorSetLayout (descriptorSetLayoutDesc);
@@ -340,11 +342,11 @@ Result initialize()
340342 // that we will render with only a single descriptor set bound.
341343 //
342344
343- PipelineLayout ::DescriptorSetDesc descriptorSets[] =
345+ IPipelineLayout ::DescriptorSetDesc descriptorSets[] =
344346 {
345- PipelineLayout ::DescriptorSetDesc
347+ IPipelineLayout ::DescriptorSetDesc
346348 };
347- PipelineLayout ::Desc pipelineLayoutDesc;
349+ IPipelineLayout ::Desc pipelineLayoutDesc;
348350 pipelineLayoutDesc.renderTargetCount = 1 ;
349351 pipelineLayoutDesc.descriptorSetCount = 1 ;
350352 pipelineLayoutDesc.descriptorSets = &descriptorSets[0 ];
0 commit comments