bug 14909: Define "length" as it relates to push constants be in units of bytes not words (WIP)
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14909
diff --git a/include/vulkan.h b/include/vulkan.h
index 3bed6dd..742e086 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1711,8 +1711,8 @@
typedef struct {
VkShaderStageFlags stageFlags;
- uint32_t start;
- uint32_t length;
+ uint32_t offset;
+ uint32_t size;
} VkPushConstantRange;
typedef struct {
@@ -2183,7 +2183,7 @@
typedef void (VKAPI *PFN_vkCmdResetQueryPool)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount);
typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot);
typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize stride, VkQueryResultFlags flags);
-typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t start, uint32_t length, const void* values);
+typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values);
typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents);
typedef void (VKAPI *PFN_vkCmdNextSubpass)(VkCmdBuffer cmdBuffer, VkRenderPassContents contents);
typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCmdBuffer cmdBuffer);
@@ -2934,8 +2934,8 @@
VkCmdBuffer cmdBuffer,
VkPipelineLayout layout,
VkShaderStageFlags stageFlags,
- uint32_t start,
- uint32_t length,
+ uint32_t offset,
+ uint32_t size,
const void* values);
void VKAPI vkCmdBeginRenderPass(
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 28ce172..645df9c 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -6435,8 +6435,8 @@
VkCmdBuffer cmdBuffer,
VkPipelineLayout layout,
VkShaderStageFlags stageFlags,
- uint32_t start,
- uint32_t length)
+ uint32_t offset,
+ uint32_t size)
{
@@ -6450,15 +6450,15 @@
VkCmdBuffer cmdBuffer,
VkPipelineLayout layout,
VkShaderStageFlags stageFlags,
- uint32_t start,
- uint32_t length,
+ uint32_t offset,
+ uint32_t size,
const void* values)
{
PreCmdPushConstants(cmdBuffer, values);
- get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPushConstants(cmdBuffer, layout, stageFlags, start, length, values);
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPushConstants(cmdBuffer, layout, stageFlags, offset, size, values);
- PostCmdPushConstants(cmdBuffer, layout, stageFlags, start, length);
+ PostCmdPushConstants(cmdBuffer, layout, stageFlags, offset, size);
}
bool PreCmdBeginRenderPass(
diff --git a/loader/trampoline.c b/loader/trampoline.c
index d2f28a8..3c15daa 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1423,13 +1423,13 @@
disp->CmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, stride, flags);
}
-LOADER_EXPORT void VKAPI vkCmdPushConstants(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t start, uint32_t length, const void* values)
+LOADER_EXPORT void VKAPI vkCmdPushConstants(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* values)
{
const VkLayerDispatchTable *disp;
disp = loader_get_dispatch(cmdBuffer);
- disp->CmdPushConstants(cmdBuffer, layout, stageFlags, start, length, values);
+ disp->CmdPushConstants(cmdBuffer, layout, stageFlags, offset, size, values);
}
LOADER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents)
diff --git a/vulkan.py b/vulkan.py
index 40d41de..a74a615 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -955,8 +955,8 @@
[Param("VkCmdBuffer", "cmdBuffer"),
Param("VkPipelineLayout", "layout"),
Param("VkShaderStageFlags", "stageFlags"),
- Param("uint32_t", "start"),
- Param("uint32_t", "length"),
+ Param("uint32_t", "offset"),
+ Param("uint32_t", "size"),
Param("const void*", "values")]),
Proto("void", "CmdBeginRenderPass",