v156: Bug 14451 - Rename dynamic state objects

3 files changed, 84 insertions, 84 deletions

diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 185a140c..f1b28868 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -215,22 +215,22 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkCreateDynamicViewportState;
     if (!strcmp(name, "DestroyDynamicViewportState"))
         return (void*) vkDestroyDynamicViewportState;
-    if (!strcmp(name, "CreateDynamicRasterLineState"))
-        return (void*) vkCreateDynamicRasterLineState;
-    if (!strcmp(name, "DestroyDynamicRasterLineState"))
-        return (void*) vkDestroyDynamicRasterLineState;
-    if (!strcmp(name, "CreateDynamicRasterDepthBiasState"))
-        return (void*) vkCreateDynamicRasterDepthBiasState;
-    if (!strcmp(name, "DestroyDynamicRasterDepthBiasState"))
-        return (void*) vkDestroyDynamicRasterDepthBiasState;
-    if (!strcmp(name, "CreateDynamicColorBlendState"))
-        return (void*) vkCreateDynamicColorBlendState;
-    if (!strcmp(name, "DestroyDynamicColorBlendState"))
-        return (void*) vkDestroyDynamicColorBlendState;
-    if (!strcmp(name, "CreateDynamicDepthState"))
-        return (void*) vkCreateDynamicDepthState;
-    if (!strcmp(name, "DestroyDynamicDepthState"))
-        return (void*) vkDestroyDynamicDepthState;
+    if (!strcmp(name, "CreateDynamicLineWidthState"))
+        return (void*) vkCreateDynamicLineWidthState;
+    if (!strcmp(name, "DestroyDynamicLineWidthState"))
+        return (void*) vkDestroyDynamicLineWidthState;
+    if (!strcmp(name, "CreateDynamicDepthBiasState"))
+        return (void*) vkCreateDynamicDepthBiasState;
+    if (!strcmp(name, "DestroyDynamicDepthBiasState"))
+        return (void*) vkDestroyDynamicDepthBiasState;
+    if (!strcmp(name, "CreateDynamicBlendState"))
+        return (void*) vkCreateDynamicBlendState;
+    if (!strcmp(name, "DestroyDynamicBlendState"))
+        return (void*) vkDestroyDynamicBlendState;
+    if (!strcmp(name, "CreateDynamicDepthBoundsState"))
+        return (void*) vkCreateDynamicDepthBoundsState;
+    if (!strcmp(name, "DestroyDynamicDepthBoundsState"))
+        return (void*) vkDestroyDynamicDepthBoundsState;
     if (!strcmp(name, "CreateDynamicStencilState"))
         return (void*) vkCreateDynamicStencilState;
     if (!strcmp(name, "DestroyDynamicStencilState"))
@@ -265,14 +265,14 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkCmdBindPipeline;
     if (!strcmp(name, "CmdBindDynamicViewportState"))
         return (void*) vkCmdBindDynamicViewportState;
-    if (!strcmp(name, "CmdBindDynamicRasterLineState"))
-        return (void*) vkCmdBindDynamicRasterLineState;
-    if (!strcmp(name, "CmdBindDynamicRasterDepthBiasState"))
-        return (void*) vkCmdBindDynamicRasterDepthBiasState;
-    if (!strcmp(name, "CmdBindDynamicColorBlendState"))
-        return (void*) vkCmdBindDynamicColorBlendState;
-    if (!strcmp(name, "CmdBindDynamicDepthState"))
-        return (void*) vkCmdBindDynamicDepthState;
+    if (!strcmp(name, "CmdBindDynamicLineWidthState"))
+        return (void*) vkCmdBindDynamicLineWidthState;
+    if (!strcmp(name, "CmdBindDynamicDepthBiasState"))
+        return (void*) vkCmdBindDynamicDepthBiasState;
+    if (!strcmp(name, "CmdBindDynamicBlendState"))
+        return (void*) vkCmdBindDynamicBlendState;
+    if (!strcmp(name, "CmdBindDynamicDepthBoundsState"))
+        return (void*) vkCmdBindDynamicDepthBoundsState;
     if (!strcmp(name, "CmdBindDynamicStencilState"))
         return (void*) vkCmdBindDynamicStencilState;
     if (!strcmp(name, "CmdBindDescriptorSets"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index d1a59d56..49f01e42 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -112,14 +112,14 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets) gpa(dev, "vkUpdateDescriptorSets");
     table->CreateDynamicViewportState = (PFN_vkCreateDynamicViewportState) gpa(dev, "vkCreateDynamicViewportState");
     table->DestroyDynamicViewportState = (PFN_vkDestroyDynamicViewportState) gpa(dev, "vkDestroyDynamicViewportState");
-    table->CreateDynamicRasterLineState = (PFN_vkCreateDynamicRasterLineState) gpa(dev, "vkCreateDynamicRasterLineState");
-    table->DestroyDynamicRasterLineState = (PFN_vkDestroyDynamicRasterLineState) gpa(dev, "vkDestroyDynamicRasterLineState");
-    table->CreateDynamicRasterDepthBiasState = (PFN_vkCreateDynamicRasterDepthBiasState) gpa(dev, "vkCreateDynamicRasterDepthBiasState");
-    table->DestroyDynamicRasterDepthBiasState = (PFN_vkDestroyDynamicRasterDepthBiasState) gpa(dev, "vkDestroyDynamicRasterDepthBiasState");
-    table->CreateDynamicColorBlendState = (PFN_vkCreateDynamicColorBlendState) gpa(dev, "vkCreateDynamicColorBlendState");
-    table->DestroyDynamicColorBlendState = (PFN_vkDestroyDynamicColorBlendState) gpa(dev, "vkDestroyDynamicColorBlendState");
-    table->CreateDynamicDepthState = (PFN_vkCreateDynamicDepthState) gpa(dev, "vkCreateDynamicDepthState");
-    table->DestroyDynamicDepthState = (PFN_vkDestroyDynamicDepthState) gpa(dev, "vkDestroyDynamicDepthState");
+    table->CreateDynamicLineWidthState = (PFN_vkCreateDynamicLineWidthState) gpa(dev, "vkCreateDynamicLineWidthState");
+    table->DestroyDynamicLineWidthState = (PFN_vkDestroyDynamicLineWidthState) gpa(dev, "vkDestroyDynamicLineWidthState");
+    table->CreateDynamicDepthBiasState = (PFN_vkCreateDynamicDepthBiasState) gpa(dev, "vkCreateDynamicDepthBiasState");
+    table->DestroyDynamicDepthBiasState = (PFN_vkDestroyDynamicDepthBiasState) gpa(dev, "vkDestroyDynamicDepthBiasState");
+    table->CreateDynamicBlendState = (PFN_vkCreateDynamicBlendState) gpa(dev, "vkCreateDynamicBlendState");
+    table->DestroyDynamicBlendState = (PFN_vkDestroyDynamicBlendState) gpa(dev, "vkDestroyDynamicBlendState");
+    table->CreateDynamicDepthBoundsState = (PFN_vkCreateDynamicDepthBoundsState) gpa(dev, "vkCreateDynamicDepthBoundsState");
+    table->DestroyDynamicDepthBoundsState = (PFN_vkDestroyDynamicDepthBoundsState) gpa(dev, "vkDestroyDynamicDepthBoundsState");
     table->CreateDynamicStencilState = (PFN_vkCreateDynamicStencilState) gpa(dev, "vkCreateDynamicStencilState");
     table->DestroyDynamicStencilState = (PFN_vkDestroyDynamicStencilState) gpa(dev, "vkDestroyDynamicStencilState");
     table->CreateFramebuffer = (PFN_vkCreateFramebuffer) gpa(dev, "vkCreateFramebuffer");
@@ -137,10 +137,10 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->ResetCommandBuffer = (PFN_vkResetCommandBuffer) gpa(dev, "vkResetCommandBuffer");
     table->CmdBindPipeline = (PFN_vkCmdBindPipeline) gpa(dev, "vkCmdBindPipeline");
     table->CmdBindDynamicViewportState = (PFN_vkCmdBindDynamicViewportState) gpa(dev, "vkCmdBindDynamicViewportState");
-    table->CmdBindDynamicRasterLineState = (PFN_vkCmdBindDynamicRasterLineState) gpa(dev, "vkCmdBindDynamicRasterLineState");
-    table->CmdBindDynamicRasterDepthBiasState = (PFN_vkCmdBindDynamicRasterDepthBiasState) gpa(dev, "vkCmdBindDynamicRasterDepthBiasState");
-    table->CmdBindDynamicColorBlendState = (PFN_vkCmdBindDynamicColorBlendState) gpa(dev, "vkCmdBindDynamicColorBlendState");
-    table->CmdBindDynamicDepthState = (PFN_vkCmdBindDynamicDepthState) gpa(dev, "vkCmdBindDynamicDepthState");
+    table->CmdBindDynamicLineWidthState = (PFN_vkCmdBindDynamicLineWidthState) gpa(dev, "vkCmdBindDynamicLineWidthState");
+    table->CmdBindDynamicDepthBiasState = (PFN_vkCmdBindDynamicDepthBiasState) gpa(dev, "vkCmdBindDynamicDepthBiasState");
+    table->CmdBindDynamicBlendState = (PFN_vkCmdBindDynamicBlendState) gpa(dev, "vkCmdBindDynamicBlendState");
+    table->CmdBindDynamicDepthBoundsState = (PFN_vkCmdBindDynamicDepthBoundsState) gpa(dev, "vkCmdBindDynamicDepthBoundsState");
     table->CmdBindDynamicStencilState = (PFN_vkCmdBindDynamicStencilState) gpa(dev, "vkCmdBindDynamicStencilState");
     table->CmdBindDescriptorSets = (PFN_vkCmdBindDescriptorSets) gpa(dev, "vkCmdBindDescriptorSets");
     table->CmdBindVertexBuffers = (PFN_vkCmdBindVertexBuffers) gpa(dev, "vkCmdBindVertexBuffers");
@@ -350,22 +350,22 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->CreateDynamicViewportState;
     if (!strcmp(name, "DestroyDynamicViewportState"))
         return (void *) table->DestroyDynamicViewportState;
-    if (!strcmp(name, "CreateDynamicRasterLineState"))
-        return (void *) table->CreateDynamicRasterLineState;
-    if (!strcmp(name, "DestroyDynamicRasterLineState"))
-        return (void *) table->DestroyDynamicRasterLineState;
-    if (!strcmp(name, "CreateDynamicRasterDepthBiasState"))
-        return (void *) table->CreateDynamicRasterDepthBiasState;
-    if (!strcmp(name, "DestroyDynamicRasterDepthBiasState"))
-        return (void *) table->DestroyDynamicRasterDepthBiasState;
-    if (!strcmp(name, "CreateDynamicColorBlendState"))
-        return (void *) table->CreateDynamicColorBlendState;
-    if (!strcmp(name, "DestroyDynamicColorBlendState"))
-        return (void *) table->DestroyDynamicColorBlendState;
-    if (!strcmp(name, "CreateDynamicDepthState"))
-        return (void *) table->CreateDynamicDepthState;
-    if (!strcmp(name, "DestroyDynamicDepthState"))
-        return (void *) table->DestroyDynamicDepthState;
+    if (!strcmp(name, "CreateDynamicLineWidthState"))
+        return (void *) table->CreateDynamicLineWidthState;
+    if (!strcmp(name, "DestroyDynamicLineWidthState"))
+        return (void *) table->DestroyDynamicLineWidthState;
+    if (!strcmp(name, "CreateDynamicDepthBiasState"))
+        return (void *) table->CreateDynamicDepthBiasState;
+    if (!strcmp(name, "DestroyDynamicDepthBiasState"))
+        return (void *) table->DestroyDynamicDepthBiasState;
+    if (!strcmp(name, "CreateDynamicBlendState"))
+        return (void *) table->CreateDynamicBlendState;
+    if (!strcmp(name, "DestroyDynamicBlendState"))
+        return (void *) table->DestroyDynamicBlendState;
+    if (!strcmp(name, "CreateDynamicDepthBoundsState"))
+        return (void *) table->CreateDynamicDepthBoundsState;
+    if (!strcmp(name, "DestroyDynamicDepthBoundsState"))
+        return (void *) table->DestroyDynamicDepthBoundsState;
     if (!strcmp(name, "CreateDynamicStencilState"))
         return (void *) table->CreateDynamicStencilState;
     if (!strcmp(name, "DestroyDynamicStencilState"))
@@ -400,14 +400,14 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->CmdBindPipeline;
     if (!strcmp(name, "CmdBindDynamicViewportState"))
         return (void *) table->CmdBindDynamicViewportState;
-    if (!strcmp(name, "CmdBindDynamicRasterLineState"))
-        return (void *) table->CmdBindDynamicRasterLineState;
-    if (!strcmp(name, "CmdBindDynamicRasterDepthBiasState"))
-        return (void *) table->CmdBindDynamicRasterDepthBiasState;
-    if (!strcmp(name, "CmdBindDynamicColorBlendState"))
-        return (void *) table->CmdBindDynamicColorBlendState;
-    if (!strcmp(name, "CmdBindDynamicDepthState"))
-        return (void *) table->CmdBindDynamicDepthState;
+    if (!strcmp(name, "CmdBindDynamicLineWidthState"))
+        return (void *) table->CmdBindDynamicLineWidthState;
+    if (!strcmp(name, "CmdBindDynamicDepthBiasState"))
+        return (void *) table->CmdBindDynamicDepthBiasState;
+    if (!strcmp(name, "CmdBindDynamicBlendState"))
+        return (void *) table->CmdBindDynamicBlendState;
+    if (!strcmp(name, "CmdBindDynamicDepthBoundsState"))
+        return (void *) table->CmdBindDynamicDepthBoundsState;
     if (!strcmp(name, "CmdBindDynamicStencilState"))
         return (void *) table->CmdBindDynamicStencilState;
     if (!strcmp(name, "CmdBindDescriptorSets"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index e5fef114..2b15afec 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1016,76 +1016,76 @@ LOADER_EXPORT VkResult VKAPI vkDestroyDynamicViewportState(VkDevice device, VkDy
     return disp->DestroyDynamicViewportState(device, dynamicViewportState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicRasterLineState(VkDevice device, const VkDynamicRasterLineStateCreateInfo* pCreateInfo, VkDynamicRasterLineState* pState)
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicLineWidthState(VkDevice device, const VkDynamicLineWidthStateCreateInfo* pCreateInfo, VkDynamicLineWidthState* pState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->CreateDynamicRasterLineState(device, pCreateInfo, pState);
+    return disp->CreateDynamicLineWidthState(device, pCreateInfo, pState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkDestroyDynamicRasterLineState(VkDevice device, VkDynamicRasterLineState dynamicRasterLineState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicLineWidthState(VkDevice device, VkDynamicLineWidthState dynamicLineWidthState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->DestroyDynamicRasterLineState(device, dynamicRasterLineState);
+    return disp->DestroyDynamicLineWidthState(device, dynamicLineWidthState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicRasterDepthBiasState(VkDevice device, const VkDynamicRasterDepthBiasStateCreateInfo* pCreateInfo, VkDynamicRasterDepthBiasState* pState)
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicDepthBiasState(VkDevice device, const VkDynamicDepthBiasStateCreateInfo* pCreateInfo, VkDynamicDepthBiasState* pState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->CreateDynamicRasterDepthBiasState(device, pCreateInfo, pState);
+    return disp->CreateDynamicDepthBiasState(device, pCreateInfo, pState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkDestroyDynamicRasterDepthBiasState(VkDevice device, VkDynamicRasterDepthBiasState dynamicRasterDepthBiasState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicDepthBiasState(VkDevice device, VkDynamicDepthBiasState dynamicDepthBiasState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->DestroyDynamicRasterDepthBiasState(device, dynamicRasterDepthBiasState);
+    return disp->DestroyDynamicDepthBiasState(device, dynamicDepthBiasState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(VkDevice device, const VkDynamicColorBlendStateCreateInfo* pCreateInfo, VkDynamicColorBlendState* pState)
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicBlendState(VkDevice device, const VkDynamicBlendStateCreateInfo* pCreateInfo, VkDynamicBlendState* pState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->CreateDynamicColorBlendState(device, pCreateInfo, pState);
+    return disp->CreateDynamicBlendState(device, pCreateInfo, pState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkDestroyDynamicColorBlendState(VkDevice device, VkDynamicColorBlendState dynamicColorBlendState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicBlendState(VkDevice device, VkDynamicBlendState dynamicBlendState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->DestroyDynamicColorBlendState(device, dynamicColorBlendState);
+    return disp->DestroyDynamicBlendState(device, dynamicBlendState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkCreateDynamicDepthState(VkDevice device, const VkDynamicDepthStateCreateInfo* pCreateInfo, VkDynamicDepthState* pState)
+LOADER_EXPORT VkResult VKAPI vkCreateDynamicDepthBoundsState(VkDevice device, const VkDynamicDepthBoundsStateCreateInfo* pCreateInfo, VkDynamicDepthBoundsState* pState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->CreateDynamicDepthState(device, pCreateInfo, pState);
+    return disp->CreateDynamicDepthBoundsState(device, pCreateInfo, pState);
 }
 
-LOADER_EXPORT VkResult VKAPI vkDestroyDynamicDepthState(VkDevice device, VkDynamicDepthState dynamicDepthState)
+LOADER_EXPORT VkResult VKAPI vkDestroyDynamicDepthBoundsState(VkDevice device, VkDynamicDepthBoundsState dynamicDepthBoundsState)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(device);
 
-    return disp->DestroyDynamicDepthState(device, dynamicDepthState);
+    return disp->DestroyDynamicDepthBoundsState(device, dynamicDepthBoundsState);
 }
 
 LOADER_EXPORT VkResult VKAPI vkCreateDynamicStencilState(VkDevice device, const VkDynamicStencilStateCreateInfo* pCreateInfoFront, const VkDynamicStencilStateCreateInfo* pCreateInfoBack, VkDynamicStencilState* pState)
@@ -1247,40 +1247,40 @@ LOADER_EXPORT void VKAPI vkCmdBindDynamicViewportState(VkCmdBuffer cmdBuffer, Vk
     disp->CmdBindDynamicViewportState(cmdBuffer, state);
 }
 
-LOADER_EXPORT void VKAPI vkCmdBindDynamicRasterLineState(VkCmdBuffer cmdBuffer, VkDynamicRasterLineState state)
+LOADER_EXPORT void VKAPI vkCmdBindDynamicLineWidthState(VkCmdBuffer cmdBuffer, VkDynamicLineWidthState state)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdBindDynamicRasterLineState(cmdBuffer, state);
+    disp->CmdBindDynamicLineWidthState(cmdBuffer, state);
 }
 
-LOADER_EXPORT void VKAPI vkCmdBindDynamicRasterDepthBiasState(VkCmdBuffer cmdBuffer, VkDynamicRasterDepthBiasState state)
+LOADER_EXPORT void VKAPI vkCmdBindDynamicDepthBiasState(VkCmdBuffer cmdBuffer, VkDynamicDepthBiasState state)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdBindDynamicRasterDepthBiasState(cmdBuffer, state);
+    disp->CmdBindDynamicDepthBiasState(cmdBuffer, state);
 }
 
-LOADER_EXPORT void VKAPI vkCmdBindDynamicColorBlendState(VkCmdBuffer cmdBuffer, VkDynamicColorBlendState state)
+LOADER_EXPORT void VKAPI vkCmdBindDynamicBlendState(VkCmdBuffer cmdBuffer, VkDynamicBlendState state)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdBindDynamicColorBlendState(cmdBuffer, state);
+    disp->CmdBindDynamicBlendState(cmdBuffer, state);
 }
 
-LOADER_EXPORT void VKAPI vkCmdBindDynamicDepthState(VkCmdBuffer cmdBuffer, VkDynamicDepthState state)
+LOADER_EXPORT void VKAPI vkCmdBindDynamicDepthBoundsState(VkCmdBuffer cmdBuffer, VkDynamicDepthBoundsState state)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdBindDynamicDepthState(cmdBuffer, state);
+    disp->CmdBindDynamicDepthBoundsState(cmdBuffer, state);
 }
 
 LOADER_EXPORT void VKAPI vkCmdBindDynamicStencilState(VkCmdBuffer cmdBuffer, VkDynamicStencilState state)