From e4a8251749cf1fbf005b045e26e25f3ef7cccb8b Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 10 Dec 2020 09:43:09 -0800 Subject: Move ShaderObject to be under renderer interface. (#1633) * Move ShaderObject to be under renderer interface. * Make `create*PipelineState` take `const PipelineStateDesc&`. * Move ShaderCursor implementation to a cpp file --- tools/gfx/d3d11/render-d3d11.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'tools/gfx/d3d11/render-d3d11.cpp') diff --git a/tools/gfx/d3d11/render-d3d11.cpp b/tools/gfx/d3d11/render-d3d11.cpp index 6a58501fd..48cf7770d 100644 --- a/tools/gfx/d3d11/render-d3d11.cpp +++ b/tools/gfx/d3d11/render-d3d11.cpp @@ -6,6 +6,7 @@ //WORKING: #include "options.h" #include "../render.h" +#include "../render-graphics-common.h" #include "../d3d/d3d-util.h" #include "../nvapi/nvapi-util.h" @@ -51,7 +52,7 @@ using namespace Slang; namespace gfx { -class D3D11Renderer : public Renderer +class D3D11Renderer : public GraphicsAPIRenderer { public: enum @@ -1776,8 +1777,11 @@ D3D11_COLOR_WRITE_ENABLE translateRenderTargetWriteMask(RenderTargetWriteMaskT m return D3D11_COLOR_WRITE_ENABLE(result); } -Result D3D11Renderer::createGraphicsPipelineState(const GraphicsPipelineStateDesc& desc, PipelineState** outState) +Result D3D11Renderer::createGraphicsPipelineState(const GraphicsPipelineStateDesc& inDesc, PipelineState** outState) { + GraphicsPipelineStateDesc desc = inDesc; + preparePipelineDesc(desc); + auto programImpl = (ShaderProgramImpl*) desc.program; ComPtr depthStencilState; @@ -1905,8 +1909,11 @@ Result D3D11Renderer::createGraphicsPipelineState(const GraphicsPipelineStateDes return SLANG_OK; } -Result D3D11Renderer::createComputePipelineState(const ComputePipelineStateDesc& desc, PipelineState** outState) +Result D3D11Renderer::createComputePipelineState(const ComputePipelineStateDesc& inDesc, PipelineState** outState) { + ComputePipelineStateDesc desc = inDesc; + preparePipelineDesc(desc); + auto programImpl = (ShaderProgramImpl*) desc.program; auto pipelineLayoutImpl = (PipelineLayoutImpl*) desc.pipelineLayout; -- cgit v1.2.3