diff options
| author | Yong He <yonghe@outlook.com> | 2021-02-04 13:50:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 13:50:51 -0800 |
| commit | c40f10b704b8bd5a744cc9b3964344585436b1ac (patch) | |
| tree | 1c9608f3cc32949d88fe04f3512cd3147fc3fe1f /tools/graphics-app-framework | |
| parent | 7f266f1ea7a51213069282296a905650fd405c3f (diff) | |
[gfx] Shader-object driven shader compilation. (#1688)
Diffstat (limited to 'tools/graphics-app-framework')
| -rw-r--r-- | tools/graphics-app-framework/gui.cpp | 5 | ||||
| -rw-r--r-- | tools/graphics-app-framework/windows/win-window.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/graphics-app-framework/gui.cpp b/tools/graphics-app-framework/gui.cpp index fded0d76a..3bc365701 100644 --- a/tools/graphics-app-framework/gui.cpp +++ b/tools/graphics-app-framework/gui.cpp @@ -335,8 +335,7 @@ void GUI::endFrame() renderer->setViewport(viewport); - auto pipelineType = PipelineType::Graphics; - renderer->setPipelineState(pipelineType, pipelineState); + renderer->setPipelineState(pipelineState); renderer->setVertexBuffer(0, vertexBuffer, sizeof(ImDrawVert)); renderer->setIndexBuffer(indexBuffer, sizeof(ImDrawIdx) == 2 ? Format::R_UInt16 : Format::R_UInt32); @@ -376,7 +375,7 @@ void GUI::endFrame() samplerState); renderer->setDescriptorSet( - pipelineType, + PipelineType::Graphics, pipelineLayout, 0, descriptorSet); diff --git a/tools/graphics-app-framework/windows/win-window.cpp b/tools/graphics-app-framework/windows/win-window.cpp index 7433603cb..3bbf2575a 100644 --- a/tools/graphics-app-framework/windows/win-window.cpp +++ b/tools/graphics-app-framework/windows/win-window.cpp @@ -1,6 +1,8 @@ // win-window.cpp #include "../window.h" +#include "core/slang-smart-pointer.h" + #include <stdio.h> #ifdef _MSC_VER @@ -64,7 +66,7 @@ private: } }; -struct ApplicationContext +struct ApplicationContext : public Slang::RefObject { HINSTANCE instance; int showCommand = SW_SHOWDEFAULT; |
