From f8472940229e8582ec9f941069fc9576bd09b94c Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 3 May 2018 18:42:13 -0400 Subject: Added Surface type - as a simple value type to hold a 2d collection of pixels. (#548) Added PngSerializeUtil allows currently for just writing Surface of RGBA format. Removes dependency on stbi_image except for in PngSerializeUtil. Removed use of gWindowWidth/Height globals - pass the height into initialize or Renderer. --- tools/render-test/render-vk.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/render-test/render-vk.cpp') diff --git a/tools/render-test/render-vk.cpp b/tools/render-test/render-vk.cpp index 9999d1e82..8ffb05c99 100644 --- a/tools/render-test/render-vk.cpp +++ b/tools/render-test/render-vk.cpp @@ -33,7 +33,7 @@ public: enum { kMaxRenderTargets = 8, kMaxAttachments = kMaxRenderTargets + 1 }; // Renderer implementation - virtual SlangResult initialize(void* inWindowHandle) override; + virtual SlangResult initialize(const Desc& desc, void* inWindowHandle) override; virtual void setClearColor(const float color[4]) override; virtual void clearFrame() override; virtual void presentFrame() override; @@ -254,6 +254,8 @@ public: int m_swapChainImageIndex = -1; float m_clearColor[4] = { 0, 0, 0, 0 }; + + Desc m_desc; }; /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! VkRenderer::Buffer !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ @@ -774,11 +776,13 @@ VkPipelineShaderStageCreateInfo VKRenderer::compileEntryPoint(const ShaderCompil // !!!!!!!!!!!!!!!!!!!!!!!!!!!! Renderer interface !!!!!!!!!!!!!!!!!!!!!!!!!! -SlangResult VKRenderer::initialize(void* inWindowHandle) +SlangResult VKRenderer::initialize(const Desc& desc, void* inWindowHandle) { SLANG_RETURN_ON_FAIL(m_module.init()); SLANG_RETURN_ON_FAIL(m_api.initGlobalProcs(m_module)); + m_desc = desc; + VkApplicationInfo applicationInfo = { VK_STRUCTURE_TYPE_APPLICATION_INFO }; applicationInfo.pApplicationName = "slang-render-test"; applicationInfo.pEngineName = "slang-render-test"; -- cgit v1.2.3