From c40f10b704b8bd5a744cc9b3964344585436b1ac Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 4 Feb 2021 13:50:51 -0800 Subject: [gfx] Shader-object driven shader compilation. (#1688) --- examples/shader-toy/main.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'examples/shader-toy/main.cpp') diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp index a1408e38e..2bbc59113 100644 --- a/examples/shader-toy/main.cpp +++ b/examples/shader-toy/main.cpp @@ -347,14 +347,12 @@ Result initialize() windowDesc.userData = this; gWindow = createWindow(windowDesc); - gfxGetCreateFunc(gfx::RendererType::DirectX11)(gRenderer.writeRef()); IRenderer::Desc rendererDesc; + rendererDesc.rendererType = RendererType::DirectX11; rendererDesc.width = gWindowWidth; rendererDesc.height = gWindowHeight; - { - Result res = gRenderer->initialize(rendererDesc, getPlatformWindowHandle(gWindow)); - if(SLANG_FAILED(res)) return res; - } + Result res = gfxCreateRenderer(&rendererDesc, getPlatformWindowHandle(gWindow), gRenderer.writeRef()); + if(SLANG_FAILED(res)) return res; int constantBufferSize = sizeof(Uniforms); @@ -477,7 +475,7 @@ void renderFrame() gRenderer->unmap(gConstantBuffer); } - gRenderer->setPipelineState(PipelineType::Graphics, gPipelineState); + gRenderer->setPipelineState(gPipelineState); gRenderer->setDescriptorSet(PipelineType::Graphics, gPipelineLayout, 0, gDescriptorSet); gRenderer->setVertexBuffer(0, gVertexBuffer, sizeof(FullScreenTriangle::Vertex)); -- cgit v1.2.3