summaryrefslogtreecommitdiff
path: root/tools/render-test/vk-api.h
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2018-05-29 16:48:04 -0400
committerTim Foley <tfoleyNV@users.noreply.github.com>2018-05-29 13:48:04 -0700
commit8b67c7b3fc163156a02a40430f7038ab2f199924 (patch)
tree3444b632f787b6655c71385333074e22c4f5e5c0 /tools/render-test/vk-api.h
parente7a83323bfc4dd698ef491375a37c65c83915951 (diff)
Feature/vulkan texture (#579)
* First pass at support for textures in vulkan. * Binding state has first pass support for VkImageView VkSampler. * Split out _calcImageViewType * Fix bug in debug build around constant buffer being added but not part of the binding description for the test. * Offset recalculated for vk texture construction just store the texture size for each mip level. * When outputing a vector type with a size of 1 in GLSL, it needs to be output as the underlying type. For example vector<float,1> should be output as float in GLSL. * Vulkan render-test produces right output for the test tests/compute/textureSamplingTest.slang -slang -gcompute -o tests/compute/textureSamplingTest.slang.actual.txt -vk * Small improvement around xml encoding a string. * More generalized test synthesis. * Fix image usage flags for Vulkan. * Improvements to what gets synthesized vulkan tests. * Do transition on all mip levels. * Fixing problems appearing from vulkan debug layer. * Disable Vulkan synthesized tests for now.
Diffstat (limited to 'tools/render-test/vk-api.h')
-rw-r--r--tools/render-test/vk-api.h117
1 files changed, 63 insertions, 54 deletions
diff --git a/tools/render-test/vk-api.h b/tools/render-test/vk-api.h
index 1616a4065..521d6301d 100644
--- a/tools/render-test/vk-api.h
+++ b/tools/render-test/vk-api.h
@@ -5,57 +5,70 @@
namespace renderer_test {
-#define VK_API_GLOBAL_PROCS(x) \
- x(vkGetInstanceProcAddr) \
- x(vkCreateInstance) \
+#define VK_API_GLOBAL_PROCS(x) \
+ x(vkGetInstanceProcAddr) \
+ x(vkCreateInstance) \
/* */
-#define VK_API_INSTANCE_PROCS(x) \
- x(vkCreateDevice) \
- x(vkCreateDebugReportCallbackEXT) \
- x(vkDestroyDebugReportCallbackEXT) \
- x(vkDebugReportMessageEXT) \
- x(vkEnumeratePhysicalDevices) \
- x(vkGetPhysicalDeviceProperties) \
- x(vkGetPhysicalDeviceFeatures) \
- x(vkGetPhysicalDeviceMemoryProperties) \
+#define VK_API_INSTANCE_PROCS(x) \
+ x(vkCreateDevice) \
+ x(vkCreateDebugReportCallbackEXT) \
+ x(vkDestroyDebugReportCallbackEXT) \
+ x(vkDebugReportMessageEXT) \
+ x(vkEnumeratePhysicalDevices) \
+ x(vkGetPhysicalDeviceProperties) \
+ x(vkGetPhysicalDeviceFeatures) \
+ x(vkGetPhysicalDeviceMemoryProperties) \
x(vkGetPhysicalDeviceQueueFamilyProperties) \
x(vkGetPhysicalDeviceFormatProperties) \
- x(vkGetDeviceProcAddr) \
+ x(vkGetDeviceProcAddr) \
/* */
-#define VK_API_DEVICE_PROCS(x) \
- x(vkCreateDescriptorPool) \
- x(vkDestroyDescriptorPool) \
- x(vkGetDeviceQueue) \
- x(vkQueueSubmit) \
- x(vkQueueWaitIdle) \
- x(vkCreateBuffer) \
- x(vkGetBufferMemoryRequirements) \
- x(vkAllocateMemory) \
- x(vkBindBufferMemory) \
- x(vkMapMemory) \
- x(vkUnmapMemory) \
- x(vkCmdCopyBuffer) \
- x(vkDestroyBuffer) \
- x(vkFreeMemory) \
- x(vkCreateDescriptorSetLayout) \
- x(vkDestroyDescriptorSetLayout) \
- x(vkAllocateDescriptorSets) \
- x(vkUpdateDescriptorSets) \
- x(vkCreatePipelineLayout) \
- x(vkDestroyPipelineLayout) \
- x(vkCreateComputePipelines) \
- x(vkCreateGraphicsPipelines) \
- x(vkDestroyPipeline) \
- x(vkCreateShaderModule) \
- x(vkDestroyShaderModule) \
+#define VK_API_DEVICE_PROCS(x) \
+ x(vkCreateDescriptorPool) \
+ x(vkDestroyDescriptorPool) \
+ x(vkGetDeviceQueue) \
+ x(vkQueueSubmit) \
+ x(vkQueueWaitIdle) \
+ x(vkCreateBuffer) \
+ x(vkAllocateMemory) \
+ x(vkMapMemory) \
+ x(vkUnmapMemory) \
+ x(vkCmdCopyBuffer) \
+ x(vkDestroyBuffer) \
+ x(vkFreeMemory) \
+ x(vkCreateDescriptorSetLayout) \
+ x(vkDestroyDescriptorSetLayout) \
+ x(vkAllocateDescriptorSets) \
+ x(vkUpdateDescriptorSets) \
+ x(vkCreatePipelineLayout) \
+ x(vkDestroyPipelineLayout) \
+ x(vkCreateComputePipelines) \
+ x(vkCreateGraphicsPipelines) \
+ x(vkDestroyPipeline) \
+ x(vkCreateShaderModule) \
+ x(vkDestroyShaderModule) \
x(vkCreateFramebuffer) \
x(vkDestroyFramebuffer) \
+ x(vkCreateImage) \
+ x(vkDestroyImage) \
+ x(vkCreateImageView) \
+ x(vkDestroyImageView) \
+ x(vkCreateRenderPass) \
+ x(vkDestroyRenderPass) \
+ x(vkCreateCommandPool) \
+ x(vkDestroyCommandPool) \
+ x(vkCreateSampler) \
+ x(vkDestroySampler) \
+ x(vkCreateBufferView) \
+ x(vkDestroyBufferView) \
+ \
+ x(vkGetBufferMemoryRequirements) \
+ x(vkGetImageMemoryRequirements) \
\
- x(vkCmdBindPipeline) \
- x(vkCmdBindDescriptorSets) \
- x(vkCmdDispatch) \
+ x(vkCmdBindPipeline) \
+ x(vkCmdBindDescriptorSets) \
+ x(vkCmdDispatch) \
x(vkCmdDraw) \
x(vkCmdSetScissor) \
x(vkCmdSetViewport) \
@@ -63,6 +76,8 @@ namespace renderer_test {
x(vkCmdBindIndexBuffer) \
x(vkCmdBeginRenderPass) \
x(vkCmdEndRenderPass) \
+ x(vkCmdPipelineBarrier) \
+ x(vkCmdCopyBufferToImage)\
\
x(vkCreateFence) \
x(vkDestroyFence) \
@@ -79,20 +94,14 @@ namespace renderer_test {
x(vkSetEvent) \
x(vkResetEvent) \
\
- x(vkCreateCommandPool) \
- x(vkDestroyCommandPool) \
- \
- x(vkFreeCommandBuffers) \
- x(vkAllocateCommandBuffers) \
- x(vkBeginCommandBuffer) \
- x(vkEndCommandBuffer) \
+ x(vkFreeCommandBuffers) \
+ x(vkAllocateCommandBuffers) \
+ x(vkBeginCommandBuffer) \
+ x(vkEndCommandBuffer) \
x(vkResetCommandBuffer) \
\
- x(vkCreateImageView) \
- x(vkDestroyImageView) \
- \
- x(vkCreateRenderPass) \
- x(vkDestroyRenderPass) \
+ x(vkBindImageMemory) \
+ x(vkBindBufferMemory) \
/* */
#if SLANG_WINDOWS_FAMILY