diff options
| author | Tobin Ehlis <tobin@lunarg.com> | 2015-07-07 10:42:20 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-17 10:05:18 -0600 |
| commit | 850926208d89d1aa33e2c8f15a4ef9b0ab52bf05 (patch) | |
| tree | ee8077aef827ec39b9e5a523889697e2ed569450 /include | |
| parent | d415ac33cf0851d99cf35fb99b87dc297a01df66 (diff) | |
| download | usermoji-850926208d89d1aa33e2c8f15a4ef9b0ab52bf05.tar.xz | |
layers: Updated DrawState to work with type safety changes
DrawState now working with cube demo, but lots of cleanup and TODO items that need to be addressed.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vk_debug_marker_lunarg.h | 1 | ||||
| -rw-r--r-- | include/vulkan.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/vk_debug_marker_lunarg.h b/include/vk_debug_marker_lunarg.h index bce7aa3b..526778f5 100644 --- a/include/vk_debug_marker_lunarg.h +++ b/include/vk_debug_marker_lunarg.h @@ -32,6 +32,7 @@ #define __VK_DEBUG_MARKER_H__ #include "vulkan.h" +#include "vk_debug_report_lunarg.h" #define VK_DEBUG_MARKER_EXTENSION_NUMBER 3 #define VK_DEBUG_MARKER_EXTENSION_VERSION VK_MAKE_VERSION(0, 1, 0) diff --git a/include/vulkan.h b/include/vulkan.h index 072ebb4e..d9bc8590 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2029,7 +2029,7 @@ typedef struct VkSamplerCreateInfo_ typedef struct VkDynamicViewportStateCreateInfo_ { - VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO + VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_VIEWPORT_STATE_CREATE_INFO const void* pNext; // Pointer to next structure uint32_t viewportAndScissorCount; // number of entries in pViewports and pScissors const VkViewport* pViewports; @@ -2038,7 +2038,7 @@ typedef struct VkDynamicViewportStateCreateInfo_ typedef struct VkDynamicRasterStateCreateInfo_ { - VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO + VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO const void* pNext; // Pointer to next structure float depthBias; float depthBiasClamp; @@ -2048,14 +2048,14 @@ typedef struct VkDynamicRasterStateCreateInfo_ typedef struct VkDynamicColorBlendStateCreateInfo_ { - VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO + VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_COLOR_BLEND_STATE_CREATE_INFO const void* pNext; // Pointer to next structure float blendConst[4]; } VkDynamicColorBlendStateCreateInfo; typedef struct VkDynamicDepthStencilStateCreateInfo_ { - VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO + VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_STENCIL_STATE_CREATE_INFO const void* pNext; // Pointer to next structure float minDepthBounds; // optional (depth_bounds_test) float maxDepthBounds; // optional (depth_bounds_test) |