bug 14365: Rename slopeScaledDepthBias to depthBiasSlopeScaled (WIP)

s/slopeScaledDepthBias/depthBiasSlopeFactor/g
s/depthBias\b/depthBiasConstantFactor/g

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14365

8 files changed, 22 insertions, 22 deletions

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 796583b5..b1b93cc3 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1091,7 +1091,7 @@ ICD_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth)
     NULLDRV_LOG_FUNC;
 }
 
-ICD_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBias, float depthBiasClamp, float slopeScaledDepthBias)
+ICD_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor)
 {
     NULLDRV_LOG_FUNC;
 }
diff --git a/include/vulkan.h b/include/vulkan.h
index 4473f648..b50ba3a0 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1640,9 +1640,9 @@ typedef struct {
     VkCullMode                                  cullMode;
     VkFrontFace                                 frontFace;
     VkBool32                                    depthBiasEnable;
-    float                                       depthBias;
+    float                                       depthBiasConstantFactor;
     float                                       depthBiasClamp;
-    float                                       slopeScaledDepthBias;
+    float                                       depthBiasSlopeFactor;
     float                                       lineWidth;
 } VkPipelineRasterStateCreateInfo;
 
@@ -2183,7 +2183,7 @@ typedef void (VKAPI *PFN_vkCmdBindPipeline)(VkCmdBuffer cmdBuffer, VkPipelineBin
 typedef void (VKAPI *PFN_vkCmdSetViewport)(VkCmdBuffer cmdBuffer, uint32_t viewportCount, const VkViewport* pViewports);
 typedef void (VKAPI *PFN_vkCmdSetScissor)(VkCmdBuffer cmdBuffer, uint32_t scissorCount, const VkRect2D* pScissors);
 typedef void (VKAPI *PFN_vkCmdSetLineWidth)(VkCmdBuffer cmdBuffer, float lineWidth);
-typedef void (VKAPI *PFN_vkCmdSetDepthBias)(VkCmdBuffer cmdBuffer, float depthBias, float depthBiasClamp, float slopeScaledDepthBias);
+typedef void (VKAPI *PFN_vkCmdSetDepthBias)(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor);
 typedef void (VKAPI *PFN_vkCmdSetBlendConstants)(VkCmdBuffer cmdBuffer, const float blendConst[4]);
 typedef void (VKAPI *PFN_vkCmdSetDepthBounds)(VkCmdBuffer cmdBuffer, float minDepthBounds, float maxDepthBounds);
 typedef void (VKAPI *PFN_vkCmdSetStencilCompareMask)(VkCmdBuffer cmdBuffer, VkStencilFaceFlags faceMask, uint32_t stencilCompareMask);
@@ -2738,9 +2738,9 @@ void VKAPI vkCmdSetLineWidth(
 
 void VKAPI vkCmdSetDepthBias(
     VkCmdBuffer                                 cmdBuffer,
-    float                                       depthBias,
+    float                                       depthBiasConstantFactor,
     float                                       depthBiasClamp,
-    float                                       slopeScaledDepthBias);
+    float                                       depthBiasSlopeFactor);
 
 void VKAPI vkCmdSetBlendConstants(
     VkCmdBuffer                                 cmdBuffer,
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 0e0c2b9f..eab667e4 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2418,9 +2418,9 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWi
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(
     VkCmdBuffer                         cmdBuffer,
-    float                               depthBias,
+    float                               depthBiasConstantFactor,
     float                               depthBiasClamp,
-    float                               slopeScaledDepthBias)
+    float                               depthBiasSlopeFactor)
 {
     VkBool32 skipCall = VK_FALSE;
     layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -2430,15 +2430,15 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(
             updateCBTracking(pCB);
             skipCall |= addCmd(dev_data, pCB, CMD_SETDEPTHBIASSTATE);
             pCB->status |= CBSTATUS_DEPTH_BIAS_SET;
-            pCB->depthBias = depthBias;
+            pCB->depthBiasConstantFactor = depthBiasConstantFactor;
             pCB->depthBiasClamp = depthBiasClamp;
-            pCB->slopeScaledDepthBias = slopeScaledDepthBias;
+            pCB->depthBiasSlopeFactor = depthBiasSlopeFactor;
         } else {
             skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetDepthBias()");
         }
     }
     if (VK_FALSE == skipCall)
-        dev_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBias, depthBiasClamp, slopeScaledDepthBias);
+        dev_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4])
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 8f7f2e94..053dafe0 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -321,9 +321,9 @@ typedef struct _GLOBAL_CB_NODE {
     vector<VkViewport>           viewports;
     vector<VkRect2D>             scissors;
     float                        lineWidth;
-    float                        depthBias;
+    float                        depthBiasConstantFactor;
     float                        depthBiasClamp;
-    float                        slopeScaledDepthBias;
+    float                        depthBiasSlopeFactor;
     float                        blendConst[4];
     float                        minDepthBounds;
     float                        maxDepthBounds;
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index b9d46103..272bbc5c 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1741,9 +1741,9 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWi
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(
     VkCmdBuffer                         cmdBuffer,
-    float                               depthBias,
+    float                               depthBiasConstantFactor,
     float                               depthBiasClamp,
-    float                               slopeScaledDepthBias)
+    float                               depthBiasSlopeFactor)
 {
     VkBool32 skipCall = VK_FALSE;
     loader_platform_thread_lock_mutex(&globalLock);
@@ -1754,7 +1754,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(
     }
     loader_platform_thread_unlock_mutex(&globalLock);
     if (VK_FALSE == skipCall) {
-        get_dispatch_table(mem_tracker_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBias, depthBiasClamp, slopeScaledDepthBias);
+        get_dispatch_table(mem_tracker_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
     }
 }
 
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 3405d01e..e52f7de8 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -5360,9 +5360,9 @@ VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWi
     get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetLineWidth(cmdBuffer, lineWidth);
 }
 
-VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBias, float depthBiasClamp, float slopeScaledDepthBias)
+VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor)
 {
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBias, depthBiasClamp, slopeScaledDepthBias);
+    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4])
diff --git a/loader/trampoline.c b/loader/trampoline.c
index f359f616..d677253d 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1135,13 +1135,13 @@ LOADER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidt
     disp->CmdSetLineWidth(cmdBuffer, lineWidth);
 }
 
-LOADER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBias, float depthBiasClamp, float slopeScaledDepthBias)
+LOADER_EXPORT void VKAPI vkCmdSetDepthBias(VkCmdBuffer cmdBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdSetDepthBias(cmdBuffer, depthBias, depthBiasClamp, slopeScaledDepthBias);
+    disp->CmdSetDepthBias(cmdBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor);
 }
 
 LOADER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4])
diff --git a/vulkan.py b/vulkan.py
index c0d18c7f..c75f2345 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -724,9 +724,9 @@ core = Extension(
 
         Proto("void", "CmdSetDepthBias",
             [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("float", "depthBias"),
+             Param("float", "depthBiasConstantFactor"),
              Param("float", "depthBiasClamp"),
-             Param("float", "slopeScaledDepthBias")]),
+             Param("float", "depthBiasSlopeFactor")]),
 
         Proto("void", "CmdSetBlendConstants",
             [Param("VkCmdBuffer", "cmdBuffer"),