bug 14918 part 2: some simple renames (WIP)
s/VK_QUEUE_SPARSE_MEMMGR_BIT/VK_QUEUE_SPARSE_BINDING_BIT/g
s/VK_SPARSE_IMAGE_FMT_/VK_SPARSE_IMAGE_FORMAT_/g
s/maxTexelBufferSize/maxTexelBufferElements/g
s/residencyStandard2DMSBlockShape/residencyStandard2DMultisampleBlockShape/g
s/formatProps/formatProperties/g
s/strideInBytes/stride/g
s/offsetInBytes/offset/g
s/blendConst\b/blendConstants/g
s/fillSize/size/g
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14918
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 2a7b483..d7844f5 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -659,7 +659,7 @@
cmd_.begin();
VkBufferCopy region = {};
- region.copySize = 4;
+ region.size = 4;
vkCmdCopyBuffer(cmd_.handle(), src.handle(), dst.handle(), 1, ®ion);
cmd_.end();
@@ -687,7 +687,7 @@
cmd_.begin();
VkBufferCopy region = {};
- region.copySize = size * sizeof(VkDeviceSize);
+ region.size = size * sizeof(VkDeviceSize);
vkCmdCopyBuffer(cmd_.handle(), src.handle(), dst.handle(), 1, ®ion);
cmd_.end();
@@ -738,7 +738,7 @@
for (int i = 0; i < ARRAY_SIZE(regions); i++) {
const VkBufferCopy &r = regions[i];
- for (int j = 0; j < r.copySize; j++) {
+ for (int j = 0; j < r.size; j++) {
EXPECT_EQ(r.srcOffset + j, data[r.destOffset + j]) <<
"Region is: " << i << "\n" <<
"Offset is: " << r.destOffset + j;
@@ -791,7 +791,7 @@
vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, 0, 1, (const void * const*)&pmemory_barrier);
VkBufferCopy region = {};
- region.copySize = 4;
+ region.size = 4;
vkCmdCopyBuffer(cmd_.handle(), bufs[0].handle(), bufs[1].handle(), 1, ®ion);
memory_barrier = bufs[1].buffer_memory_barrier(
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 76705fe..d265265 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1856,8 +1856,8 @@
VkPipelineCacheCreateInfo pc_ci = {};
pc_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
- pc_ci.initialSize = 0;
- pc_ci.initialData = 0;
+ pc_ci.initialDataSize = 0;
+ pc_ci.pInitialData = 0;
pc_ci.maxSize = 0;
VkPipeline pipeline;
@@ -4747,8 +4747,8 @@
m_cmdBuffer->FillBuffer(buffer.handle(), 0, 6, 0x11111111);
msgFlags = m_errorMonitor->GetState(&msgString);
ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive an err after calling FillBuffer with bad size";
- if (!strstr(msgString.c_str(),"fillSize, is not a multiple of 4")) {
- FAIL() << "Error received was not 'vkCmdFillBuffer parameter, VkDeviceSize fillSize, is not a multiple of 4'";
+ if (!strstr(msgString.c_str(),"size, is not a multiple of 4")) {
+ FAIL() << "Error received was not 'vkCmdFillBuffer parameter, VkDeviceSize size, is not a multiple of 4'";
}
EndCommandBuffer();
}
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 4c1e8a8..9576e69 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -762,7 +762,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -770,11 +770,11 @@
vi_attribs[0].binding = MESH_BIND_ID; // Binding ID
vi_attribs[0].location = 0; // location, position
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BIND_ID; // Binding ID
vi_attribs[1].location = 1; // location, color
vi_attribs[1].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 1*sizeof(float)*4; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = 1*sizeof(float)*4; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -841,7 +841,7 @@
#define MESH_BUF_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
- sizeof(vb_data[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(vb_data[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -849,7 +849,7 @@
vi_attrib.binding = MESH_BUF_ID; // index into vertexBindingDescriptions
vi_attrib.location = 0;
vi_attrib.format = VK_FORMAT_R32G32_SFLOAT; // format of source data
- vi_attrib.offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attrib.offset = 0; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(&vi_attrib, 1);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -950,7 +950,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -958,11 +958,11 @@
vi_attribs[0].binding = MESH_BIND_ID; // binding ID from BINDING_DESCRIPTION array to use for this attribute
vi_attribs[0].location = 0; // layout location of vertex attribute
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BIND_ID; // binding ID from BINDING_DESCRIPTION array to use for this attribute
vi_attribs[1].location = 1; // layout location of vertex attribute
vi_attribs[1].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 16; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = 16; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1043,7 +1043,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1051,7 +1051,7 @@
vi_attribs[0].binding = MESH_BIND_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,1);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1131,7 +1131,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1139,7 +1139,7 @@
vi_attribs[0].binding = MESH_BIND_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,1);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1229,7 +1229,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1237,7 +1237,7 @@
vi_attribs[0].binding = MESH_BIND_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,1);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1318,7 +1318,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1326,7 +1326,7 @@
vi_attribs[0].binding = MESH_BIND_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs,1);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1555,7 +1555,7 @@
#define MESH_BUF_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1563,11 +1563,11 @@
vi_attribs[0].binding = MESH_BUF_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BUF_ID; // binding ID
vi_attribs[1].location = 1;
vi_attribs[1].format = VK_FORMAT_R32G32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 16; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = 16; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs, 2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1658,7 +1658,7 @@
#define MESH_BUF_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
- sizeof(vData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(vData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1666,11 +1666,11 @@
vi_attribs[0].binding = MESH_BUF_ID; // binding ID
vi_attribs[0].location = 4;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = sizeof(float) * 4 * 2; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = sizeof(float) * 4 * 2; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BUF_ID; // binding ID
vi_attribs[1].location = 1;
vi_attribs[1].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = sizeof(float) * 4 * 1; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = sizeof(float) * 4 * 1; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs, 2);
pipelineobj.AddVertexInputBindings(&vi_binding, 1);
@@ -1751,7 +1751,7 @@
#define MESH_BUF_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1759,11 +1759,11 @@
vi_attribs[0].binding = MESH_BUF_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BUF_ID; // binding ID
vi_attribs[1].location = 1;
vi_attribs[1].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 16; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = 16; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs, 2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -1868,7 +1868,7 @@
#define MESH_BUF_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
- sizeof(g_vbData[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vbData[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -1876,11 +1876,11 @@
vi_attribs[0].binding = MESH_BUF_ID; // binding ID
vi_attribs[0].location = 0;
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BUF_ID; // binding ID
vi_attribs[1].location = 1;
vi_attribs[1].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 16; // Offset of first element in bytes from base of vertex
+ vi_attribs[1].offset = 16; // Offset of first element in bytes from base of vertex
pipelineobj.AddVertexInputAttribs(vi_attribs, 2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
@@ -2743,7 +2743,7 @@
#define MESH_BIND_ID 0
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
- sizeof(g_vb_texture_Data[0]), // strideInBytes; Distance between vertices in bytes (0 = no advancement)
+ sizeof(g_vb_texture_Data[0]), // stride; Distance between vertices in bytes (0 = no advancement)
VK_VERTEX_INPUT_STEP_RATE_VERTEX // stepRate; // Rate at which binding is incremented
};
@@ -2751,11 +2751,11 @@
vi_attribs[0].binding = MESH_BIND_ID; // Binding ID
vi_attribs[0].location = 0; // location
vi_attribs[0].format = VK_FORMAT_R32G32B32A32_SFLOAT; // format of source data
- vi_attribs[0].offsetInBytes = 0; // Offset of first element in bytes from base of vertex
+ vi_attribs[0].offset = 0; // Offset of first element in bytes from base of vertex
vi_attribs[1].binding = MESH_BIND_ID; // Binding ID
vi_attribs[1].location = 1; // location
vi_attribs[1].format = VK_FORMAT_R32G32_SFLOAT; // format of source data
- vi_attribs[1].offsetInBytes = 16; // Offset of uv components
+ vi_attribs[1].offset = 16; // Offset of uv components
pipelineobj.AddVertexInputAttribs(vi_attribs,2);
pipelineobj.AddVertexInputBindings(&vi_binding,1);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index d571d8f..9e4bafa 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -206,10 +206,10 @@
m_depthBiasClamp = 0.0f;
m_depthBiasSlopeFactor = 0.0f;
- m_blendConst[0] = 1.0f;
- m_blendConst[1] = 1.0f;
- m_blendConst[2] = 1.0f;
- m_blendConst[3] = 1.0f;
+ m_blendConstants[0] = 1.0f;
+ m_blendConstants[1] = 1.0f;
+ m_blendConstants[2] = 1.0f;
+ m_blendConstants[3] = 1.0f;
m_minDepthBounds = 0.f;
m_maxDepthBounds = 1.f;
@@ -1147,10 +1147,10 @@
m_cb_state.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
m_cb_state.pNext = VK_NULL_HANDLE;
m_cb_state.logicOp = VK_LOGIC_OP_COPY;
- m_cb_state.blendConst[0] = 1.0f;
- m_cb_state.blendConst[1] = 1.0f;
- m_cb_state.blendConst[2] = 1.0f;
- m_cb_state.blendConst[3] = 1.0f;
+ m_cb_state.blendConstants[0] = 1.0f;
+ m_cb_state.blendConstants[1] = 1.0f;
+ m_cb_state.blendConstants[2] = 1.0f;
+ m_cb_state.blendConstants[3] = 1.0f;
m_ms_state.pNext = VK_NULL_HANDLE;
m_ms_state.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
@@ -1543,9 +1543,9 @@
}
void VkCommandBufferObj::SetBlendConstants(
- const float blendConst[4])
+ const float blendConstants[4])
{
- vkCmdSetBlendConstants( handle(), blendConst);
+ vkCmdSetBlendConstants( handle(), blendConstants);
}
void VkCommandBufferObj::SetDepthBounds(
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index a68380b..4415b9c 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -116,7 +116,7 @@
float m_depthBiasConstantFactor;
float m_depthBiasClamp;
float m_depthBiasSlopeFactor;
- float m_blendConst[4];
+ float m_blendConstants[4];
float m_minDepthBounds;
float m_maxDepthBounds;
uint32_t m_stencilCompareMask;
@@ -193,7 +193,7 @@
void SetScissor(uint32_t scissorCount, const VkRect2D* pScissors);
void SetLineWidth(float lineWidth);
void SetDepthBias(float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor);
- void SetBlendConstants(const float blendConst[4]);
+ void SetBlendConstants(const float blendConstants[4]);
void SetDepthBounds(float minDepthBounds, float maxDepthBounds);
void SetStencilReadMask(VkStencilFaceFlags faceMask, uint32_t stencilCompareMask);
void SetStencilWriteMask(VkStencilFaceFlags faceMask, uint32_t stencilWriteMask);