summaryrefslogtreecommitdiffstats
path: root/tools/render-test/vk-util.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-05-03 14:25:13 -0400
committerGitHub <noreply@github.com>2018-05-03 14:25:13 -0400
commit367f3a78a40731da45ee12b9a18c94707f1d1429 (patch)
tree5993ef627e1a094ea1d401c31e6b00e3c63c308a /tools/render-test/vk-util.cpp
parent78935493587ec65a199d844327613021667acc1b (diff)
Feature/vulkan first render (#545)
* First pass at InputLayout for Vulkan Add support for RGBA_Float32 * Use VulkanModule and VulkanApi to handle accessing Vulkan types. * First pass at Vulkan swap chain/Device queue. * Added VulkanUtil for generic function functions. * Move more functionality to VulkanApi and VulkanUtil. Make Buffer able to initialize itself. * More tidy up around VulkanDeviceQueue * First pass use of VulkanDeviceQueue in VkRenderer * First pass use of VulkanSwapChain on VkRenderer * Added depth formats. Binding for constant and vertex buffers for Vulkan. * Setting up VkImageView on backbuffers. * First pass support for setting up vkRenderPass. * Fixes to work around Vulkan swap chain/verification issues. * Added support for Pipeline and a pipeline cache. * Working without waiting - because use of pipeline cache. * Added support for VkFramebuffer in Vulkan. * First pass at creating Vulkan graphics pipeline. * More efforts to get Vulkan to render. * Small improvement for checking of Binding flags. * Removed setConstantBuffers from the Renderer interface - so that all resource binding takes place through the BindingState. To make this work required a 'hack' in render-test main.cpp - so that the constant buffer binding that is needed in some tests is only added when it doesn't clash. * RendererID -> unified into RendererType. Added getRendererType to Renderer interface. Added ProjectionStyle, and function to get from RendererType. Added getIdentityProjection to RendererUtil - to get projection that is the 'identity' - but hits the same pixels for all projection styles. * Fix build problem on Win32 on Vulkan where should use VK_NULL_HANDLE. * Improve naming, comments. Remove dead code. * Remove unwanted comment.
Diffstat (limited to 'tools/render-test/vk-util.cpp')
-rw-r--r--tools/render-test/vk-util.cpp58
1 files changed, 58 insertions, 0 deletions
diff --git a/tools/render-test/vk-util.cpp b/tools/render-test/vk-util.cpp
new file mode 100644
index 000000000..022d15a32
--- /dev/null
+++ b/tools/render-test/vk-util.cpp
@@ -0,0 +1,58 @@
+// vk-util.cpp
+#include "vk-util.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+namespace renderer_test {
+
+/* static */VkFormat VulkanUtil::getVkFormat(Format format)
+{
+ switch (format)
+ {
+ case Format::RGBA_Float32: return VK_FORMAT_R32G32B32A32_SFLOAT;
+ case Format::RGB_Float32: return VK_FORMAT_R32G32B32_SFLOAT;
+ case Format::RG_Float32: return VK_FORMAT_R32G32_SFLOAT;
+ case Format::R_Float32: return VK_FORMAT_R32_SFLOAT;
+ case Format::RGBA_Unorm_UInt8: return VK_FORMAT_R8G8B8A8_UNORM;
+
+ case Format::D_Float32: return VK_FORMAT_D32_SFLOAT;
+ case Format::D_Unorm24_S8: return VK_FORMAT_D24_UNORM_S8_UINT;
+
+ default: return VK_FORMAT_UNDEFINED;
+ }
+}
+
+/* static */SlangResult VulkanUtil::toSlangResult(VkResult res)
+{
+ return (res == VK_SUCCESS) ? SLANG_OK : SLANG_FAIL;
+}
+
+/* static */Slang::Result VulkanUtil::handleFail(VkResult res)
+{
+ if (res != VK_SUCCESS)
+ {
+ assert(!"Vulkan returned a failure");
+ }
+ return toSlangResult(res);
+}
+
+/* static */void VulkanUtil::checkFail(VkResult res)
+{
+ assert(res != VK_SUCCESS);
+ assert(!"Vulkan check failed");
+
+}
+
+/* static */VkPrimitiveTopology VulkanUtil::getVkPrimitiveTopology(PrimitiveTopology topology)
+{
+ switch (topology)
+ {
+ case PrimitiveTopology::TriangleList: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+ default: break;
+ }
+ assert(!"Unknown topology");
+ return VK_PRIMITIVE_TOPOLOGY_MAX_ENUM;
+}
+
+} // renderer_test