bug 14918 part 3: sed renames
s/VK_MAX_PHYSICAL_DEVICE_NAME\b/VK_MAX_PHYSICAL_DEVICE_NAME_SIZE/g
s/VK_UUID_LENGTH/VK_UUID_SIZE/g
s/VK_MAX_EXTENSION_NAME\b/VK_MAX_EXTENSION_NAME_SIZE/g
s/VK_MAX_DESCRIPTION\b/VK_MAX_DESCRIPTION_SIZE/g
s/VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO/VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO/g
s/VK_CHANNEL_SWIZZLE/VK_COMPONENT_SWIZZLE/g
s/VkChannelSwizzle/VkComponentSwizzle/g
s/VK_VERTEX_INPUT_STEP_RATE/VK_VERTEX_INPUT_RATE/g
s/VkVertexInputStepRate/VkVertexInputRate/g
s/VK_FILL_MODE_SOLID/VK_POLYGON_MODE_FILL/g
s/VK_FILL_MODE_WIREFRAME/VK_POLYGON_MODE_LINE/g
s/VK_FILL_MODE_POINTS/VK_POLYGON_MODE_POINT/g
s/VkFillMode/VkPolygonMode/g
s/fillMode/polygonMode/g
s/VkBlend\b/VkBlendFactor/g
s/VK_BLEND_ZERO/VK_BLEND_FACTOR_ZERO/g
s/VK_BLEND_ONE/VK_BLEND_FACTOR_ONE/g
s/VK_BLEND_SRC/VK_BLEND_FACTOR_SRC/g
s/VK_BLEND_DST/VK_BLEND_FACTOR_DST/g
s/VK_BLEND_CONSTANT/VK_BLEND_FACTOR_CONSTANT/g
s/VK_RENDER_PASS_CONTENTS/VK_SUBPASS_CONTENTS/g
s/VkRenderPassContents/VkSubpassContents/g
s/VK_QUEUE_DMA_BIT/VK_QUEUE_TRANSFER_BIT/g
s/VK_CHANNEL_/VK_COLOR_COMPONENT_/g
s/VkChannelFlagBits/VkColorComponentFlagBits/g
s/VK_QUERY_CONTROL_CONSERVATIVE_BIT/VK_QUERY_CONTROL_PRECISE_BIT/g
s/occlusionQueryNonConservative/occlusionQueryPrecise/g
s/recommendedBufferCopyOffsetAlignment/optimalBufferCopyOffsetAlignment/g
s/recommendedBufferCopyRowPitchAlignment/optimalBufferCopyRowPitchAlignment/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/VkImageSubresourceCopy/VkImageSubresourceLayers/g
s/typeCount/poolSizeCount/g
s/pTypeCounts/pPoolSizes/g
s/VkDescriptorTypeCount/VkDescriptorPoolSize/g
s/srcBlendColor/srcColorBlendFactor/g
s/dstBlendColor/dstColorBlendFactor/g
s/blendOpColor/colorBlendOp/g
s/srcBlendAlpha/srcAlphaBlendFactor/g
s/dstBlendAlpha/dstAlphaBlendFactor/g
s/blendOpAlpha/alphaBlendOp/g
s/channelWriteMask/colorWriteMask/g
s/stencilFailOp/failOp/g
s/stencilPassOp/passOp/g
s/stencilDepthFailOp/depthFailOp/g
s/stencilCompareOp/compareOp/g
s/stencilCompareMask/compareMask/g
s/stencilWriteMask/writeMask/g
s/stencilReference/reference/g
s/originX/x/g
s/originY/y/g
s/stepRate/inputRate/g
s/VkChannelMapping/VkComponentMapping/g
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index ea5e71f..919488e 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -70,7 +70,7 @@
bool walk(Action action, Image &img) const;
bool walk_region(Action action, const VkBufferImageCopy ®ion, const VkSubresourceLayout &layout, void *data) const;
- std::vector<uint8_t> pattern_hash(const VkImageSubresourceCopy &subres, const VkOffset3D &offset) const;
+ std::vector<uint8_t> pattern_hash(const VkImageSubresourceLayers &subres, const VkOffset3D &offset) const;
static uint32_t hash_salt_;
@@ -269,7 +269,7 @@
return (it == regions_.end());
}
-std::vector<uint8_t> ImageChecker::pattern_hash(const VkImageSubresourceCopy &subres, const VkOffset3D &offset) const
+std::vector<uint8_t> ImageChecker::pattern_hash(const VkImageSubresourceLayers &subres, const VkOffset3D &offset) const
{
#define HASH_BYTE(val, b) static_cast<uint8_t>((static_cast<uint32_t>(val) >> (b * 8)) & 0xff)
#define HASH_BYTES(val) HASH_BYTE(val, 0), HASH_BYTE(val, 1), HASH_BYTE(val, 2), HASH_BYTE(val, 3)
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index de642f6..22b1d1f 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -274,7 +274,7 @@
// VkImage image;
// VkImageViewType viewType;
// VkFormat format;
- // VkChannelMapping channels;
+ // VkComponentMapping channels;
// VkImageSubresourceRange subresourceRange;
// float minLod;
// } VkImageViewCreateInfo;
@@ -283,10 +283,10 @@
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = fmt;
- viewInfo.channels.r = VK_CHANNEL_SWIZZLE_R;
- viewInfo.channels.g = VK_CHANNEL_SWIZZLE_G;
- viewInfo.channels.b = VK_CHANNEL_SWIZZLE_B;
- viewInfo.channels.a = VK_CHANNEL_SWIZZLE_A;
+ viewInfo.channels.r = VK_COMPONENT_SWIZZLE_R;
+ viewInfo.channels.g = VK_COMPONENT_SWIZZLE_G;
+ viewInfo.channels.b = VK_COMPONENT_SWIZZLE_B;
+ viewInfo.channels.a = VK_COMPONENT_SWIZZLE_A;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
diff --git a/tests/init.cpp b/tests/init.cpp
index 452c58f..cb55b1a 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -436,7 +436,7 @@
// VkImage image;
// VkImageViewType viewType;
// VkFormat format;
-// VkChannelMapping channels;
+// VkComponentMapping channels;
// VkImageSubresourceRange subresourceRange;
// float minLod;
// } VkImageViewCreateInfo;
@@ -447,10 +447,10 @@
viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
viewInfo.format = fmt;
- viewInfo.channels.r = VK_CHANNEL_SWIZZLE_R;
- viewInfo.channels.g = VK_CHANNEL_SWIZZLE_G;
- viewInfo.channels.b = VK_CHANNEL_SWIZZLE_B;
- viewInfo.channels.a = VK_CHANNEL_SWIZZLE_A;
+ viewInfo.channels.r = VK_COMPONENT_SWIZZLE_R;
+ viewInfo.channels.g = VK_COMPONENT_SWIZZLE_G;
+ viewInfo.channels.b = VK_COMPONENT_SWIZZLE_B;
+ viewInfo.channels.a = VK_COMPONENT_SWIZZLE_A;
viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.layerCount = 1;
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 94ef3db..c36c99c 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -357,10 +357,10 @@
// Make sure depthWriteEnable is set so that Depth fail test will work correctly
// Make sure stencilTestEnable is set so that Stencil fail test will work correctly
VkStencilOpState stencil = {};
- stencil.stencilFailOp = VK_STENCIL_OP_KEEP;
- stencil.stencilPassOp = VK_STENCIL_OP_KEEP;
- stencil.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- stencil.stencilCompareOp = VK_COMPARE_OP_NEVER;
+ stencil.failOp = VK_STENCIL_OP_KEEP;
+ stencil.passOp = VK_STENCIL_OP_KEEP;
+ stencil.depthFailOp = VK_STENCIL_OP_KEEP;
+ stencil.compareOp = VK_COMPARE_OP_NEVER;
VkPipelineDepthStencilStateCreateInfo ds_ci = {};
ds_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
@@ -848,7 +848,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -856,8 +856,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1069,7 +1069,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -1077,8 +1077,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1342,7 +1342,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -1350,8 +1350,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1441,7 +1441,7 @@
m_errorMonitor->ClearState();
// Create Pool w/ 1 Sampler descriptor, but try to alloc Uniform Buffer descriptor from it
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLER;
ds_type_count.descriptorCount = 1;
@@ -1450,8 +1450,8 @@
ds_pool_ci.pNext = NULL;
ds_pool_ci.flags = 0;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1501,7 +1501,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -1509,11 +1509,11 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
+ ds_pool_ci.poolSizeCount = 1;
ds_pool_ci.flags = 0;
// Not specifying VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT means
// app can only call vkResetDescriptorPool on this pool.;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1620,7 +1620,7 @@
ASSERT_NO_FATAL_FAILURE(InitViewport());
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -1628,8 +1628,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1788,7 +1788,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -1796,8 +1796,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -1889,15 +1889,15 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), VK_DESCRIPTOR_POOL_USAGE_NON_FREE, 1, &ds_pool_ci, NULL, &ds_pool);
@@ -2014,15 +2014,15 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -2123,15 +2123,15 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -2231,15 +2231,15 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -2316,7 +2316,7 @@
ia_ci.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
VkPipelineRasterizationStateCreateInfo rs_ci = {};
- rs_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
+ rs_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
rs_ci.pNext = nullptr;
VkPipelineColorBlendStateCreateInfo cb_ci = {};
@@ -2389,15 +2389,15 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
VkDescriptorPoolCreateInfo ds_pool_ci = {};
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -2474,7 +2474,7 @@
ia_ci.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
VkPipelineRasterizationStateCreateInfo rs_ci = {};
- rs_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
+ rs_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
rs_ci.pNext = nullptr;
VkPipelineColorBlendStateCreateInfo cb_ci = {};
@@ -2548,7 +2548,7 @@
BeginCommandBuffer();
// Don't care about RenderPass handle b/c error should be flagged before that
- vkCmdBeginRenderPass(m_commandBuffer->GetBufferHandle(), NULL, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass(m_commandBuffer->GetBufferHandle(), NULL, VK_SUBPASS_CONTENTS_INLINE);
msgFlags = m_errorMonitor->GetState(&msgString);
ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive error after binding NULL RenderPass.";
@@ -2575,7 +2575,7 @@
rp_begin.renderPass = renderPass();
rp_begin.framebuffer = framebuffer();
- vkCmdBeginRenderPass(m_commandBuffer->GetBufferHandle(), &rp_begin, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass(m_commandBuffer->GetBufferHandle(), &rp_begin, VK_SUBPASS_CONTENTS_INLINE);
msgFlags = m_errorMonitor->GetState(&msgString);
ASSERT_TRUE(0 != (msgFlags & VK_DBG_REPORT_ERROR_BIT)) << "Did not receive error after binding RenderPass w/i an active RenderPass.";
@@ -2851,7 +2851,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
//VkDescriptorSetObj descriptorSet(m_device);
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -2859,8 +2859,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -2947,7 +2947,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
//VkDescriptorSetObj descriptorSet(m_device);
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -2955,8 +2955,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3045,7 +3045,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
//VkDescriptorSetObj descriptorSet(m_device);
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -3053,8 +3053,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3142,7 +3142,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -3150,8 +3150,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3238,7 +3238,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
// TODO : Farm Descriptor setup code to helper function(s) to reduce copied code
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLER;
ds_type_count.descriptorCount = 1;
@@ -3246,8 +3246,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3313,7 +3313,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
ds_type_count.descriptorCount = 1;
@@ -3321,8 +3321,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3413,7 +3413,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
//VkDescriptorSetObj descriptorSet(m_device);
- VkDescriptorTypeCount ds_type_count[2] = {};
+ VkDescriptorPoolSize ds_type_count[2] = {};
ds_type_count[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count[0].descriptorCount = 1;
ds_type_count[1].type = VK_DESCRIPTOR_TYPE_SAMPLER;
@@ -3423,8 +3423,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 2;
- ds_pool_ci.pTypeCounts = ds_type_count;
+ ds_pool_ci.poolSizeCount = 2;
+ ds_pool_ci.pPoolSizes = ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3555,7 +3555,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -3563,8 +3563,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3647,7 +3647,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -3655,8 +3655,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -3752,7 +3752,7 @@
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
ds_type_count.descriptorCount = 1;
@@ -3760,8 +3760,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
@@ -5506,7 +5506,7 @@
ASSERT_NO_FATAL_FAILURE(InitState());
m_errorMonitor->ClearState();
- VkDescriptorTypeCount ds_type_count = {};
+ VkDescriptorPoolSize ds_type_count = {};
ds_type_count.type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
ds_type_count.descriptorCount = 1;
@@ -5514,8 +5514,8 @@
ds_pool_ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
ds_pool_ci.pNext = NULL;
ds_pool_ci.maxSets = 1;
- ds_pool_ci.typeCount = 1;
- ds_pool_ci.pTypeCounts = &ds_type_count;
+ ds_pool_ci.poolSizeCount = 1;
+ ds_pool_ci.pPoolSizes = &ds_type_count;
VkDescriptorPool ds_pool;
err = vkCreateDescriptorPool(m_device->device(), &ds_pool_ci, NULL, &ds_pool);
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index b9de073..5d0b582 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -763,7 +763,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -842,7 +842,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attrib;
@@ -860,7 +860,7 @@
VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
- att.channelWriteMask = 0xf;
+ att.colorWriteMask = 0xf;
pipelineobj.AddColorAttachment(1, &att);
ASSERT_VK_SUCCESS(BeginCommandBuffer());
@@ -951,7 +951,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1044,7 +1044,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1132,7 +1132,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1230,7 +1230,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1319,7 +1319,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[1];
@@ -1556,7 +1556,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1659,7 +1659,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1752,7 +1752,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -1855,10 +1855,10 @@
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds_state.depthBoundsTestEnable = VK_FALSE;
ds_state.stencilTestEnable = VK_FALSE;
- ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds_state.front = ds_state.back;
pipelineobj.SetDepthStencil(&ds_state);
@@ -1869,7 +1869,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BUF_ID, // Binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -2744,7 +2744,7 @@
VkVertexInputBindingDescription vi_binding = {
MESH_BIND_ID, // binding ID
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
+ VK_VERTEX_INPUT_RATE_VERTEX // inputRate; // Rate at which binding is incremented
};
VkVertexInputAttributeDescription vi_attribs[2];
@@ -2766,10 +2766,10 @@
ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
ds_state.depthBoundsTestEnable = VK_FALSE;
ds_state.stencilTestEnable = VK_FALSE;
- ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
ds_state.front = ds_state.back;
pipelineobj.SetDepthStencil(&ds_state);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 34f5f2d..75e474f 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -214,9 +214,9 @@
m_minDepthBounds = 0.f;
m_maxDepthBounds = 1.f;
- m_stencilCompareMask = 0xff;
- m_stencilWriteMask = 0xff;
- m_stencilReference = 0;
+ m_compareMask = 0xff;
+ m_writeMask = 0xff;
+ m_reference = 0;
VkCommandPoolCreateInfo cmd_pool_info;
cmd_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
@@ -233,8 +233,8 @@
{
VkViewport viewport;
VkRect2D scissor;
- viewport.originX = 0;
- viewport.originY = 0;
+ viewport.x = 0;
+ viewport.y = 0;
viewport.width = 1.f * width;
viewport.height = 1.f * height;
viewport.minDepth = 0.f;
@@ -439,7 +439,7 @@
int VkDescriptorSetObj::AppendDummy()
{
/* request a descriptor but do not update it */
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -453,7 +453,7 @@
type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ||
type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC);
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = type;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -466,7 +466,7 @@
int VkDescriptorSetObj::AppendSamplerTexture( VkSamplerObj* sampler, VkTextureObj* texture)
{
- VkDescriptorTypeCount tc = {};
+ VkDescriptorPoolSize tc = {};
tc.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
tc.descriptorCount = 1;
m_type_counts.push_back(tc);
@@ -496,9 +496,9 @@
// create VkDescriptorPool
VkDescriptorPoolCreateInfo pool = {};
pool.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
- pool.typeCount = m_type_counts.size();
+ pool.poolSizeCount = m_type_counts.size();
pool.maxSets = 1;
- pool.pTypeCounts = m_type_counts.data();
+ pool.pPoolSizes = m_type_counts.data();
init(*m_device, pool);
// create VkDescriptorSetLayout
@@ -815,10 +815,10 @@
view.image = VK_NULL_HANDLE;
view.viewType = VK_IMAGE_VIEW_TYPE_2D;
view.format = tex_format;
- view.channels.r = VK_CHANNEL_SWIZZLE_R;
- view.channels.g = VK_CHANNEL_SWIZZLE_G;
- view.channels.b = VK_CHANNEL_SWIZZLE_B;
- view.channels.a = VK_CHANNEL_SWIZZLE_A;
+ view.channels.r = VK_COMPONENT_SWIZZLE_R;
+ view.channels.g = VK_COMPONENT_SWIZZLE_G;
+ view.channels.b = VK_COMPONENT_SWIZZLE_B;
+ view.channels.a = VK_COMPONENT_SWIZZLE_A;
view.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
view.subresourceRange.baseMipLevel = 0;
view.subresourceRange.levelCount = 1;
@@ -1128,11 +1128,11 @@
m_ia_state.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
m_ia_state.primitiveRestartEnable = VK_FALSE;
- m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTER_STATE_CREATE_INFO;
+ m_rs_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
m_rs_state.pNext = VK_NULL_HANDLE;
m_rs_state.depthClampEnable = VK_TRUE;
m_rs_state.rasterizerDiscardEnable = VK_FALSE;
- m_rs_state.fillMode = VK_FILL_MODE_SOLID;
+ m_rs_state.polygonMode = VK_POLYGON_MODE_FILL;
m_rs_state.cullMode = VK_CULL_MODE_BACK_BIT;
m_rs_state.frontFace = VK_FRONT_FACE_CLOCKWISE;
m_rs_state.depthBiasEnable = VK_FALSE;
@@ -1172,14 +1172,14 @@
m_ds_state.depthWriteEnable = VK_FALSE;
m_ds_state.depthBoundsTestEnable = VK_FALSE;
m_ds_state.depthCompareOp = VK_COMPARE_OP_LESS_OR_EQUAL;
- m_ds_state.back.stencilDepthFailOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilFailOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilPassOp = VK_STENCIL_OP_KEEP;
- m_ds_state.back.stencilCompareOp = VK_COMPARE_OP_ALWAYS;
+ m_ds_state.back.depthFailOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.failOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.passOp = VK_STENCIL_OP_KEEP;
+ m_ds_state.back.compareOp = VK_COMPARE_OP_ALWAYS;
m_ds_state.stencilTestEnable = VK_FALSE;
- m_ds_state.back.stencilCompareMask = 0xff;
- m_ds_state.back.stencilWriteMask = 0xff;
- m_ds_state.back.stencilReference = 0;
+ m_ds_state.back.compareMask = 0xff;
+ m_ds_state.back.writeMask = 0xff;
+ m_ds_state.back.reference = 0;
m_ds_state.minDepthBounds = 0.f;
m_ds_state.maxDepthBounds = 1.f;
@@ -1505,7 +1505,7 @@
void VkCommandBufferObj::BeginRenderPass(const VkRenderPassBeginInfo &info)
{
- vkCmdBeginRenderPass( handle(), &info, VK_RENDER_PASS_CONTENTS_INLINE);
+ vkCmdBeginRenderPass( handle(), &info, VK_SUBPASS_CONTENTS_INLINE);
}
void VkCommandBufferObj::EndRenderPass()
@@ -1555,23 +1555,23 @@
void VkCommandBufferObj::SetStencilReadMask(
VkStencilFaceFlags faceMask,
- uint32_t stencilCompareMask)
+ uint32_t compareMask)
{
- vkCmdSetStencilCompareMask( handle(), faceMask, stencilCompareMask);
+ vkCmdSetStencilCompareMask( handle(), faceMask, compareMask);
}
void VkCommandBufferObj::SetStencilWriteMask(
VkStencilFaceFlags faceMask,
- uint32_t stencilWriteMask)
+ uint32_t writeMask)
{
- vkCmdSetStencilWriteMask( handle(), faceMask, stencilWriteMask);
+ vkCmdSetStencilWriteMask( handle(), faceMask, writeMask);
}
void VkCommandBufferObj::SetStencilReference(
VkStencilFaceFlags faceMask,
- uint32_t stencilReference)
+ uint32_t reference)
{
- vkCmdSetStencilReference( handle(), faceMask, stencilReference);
+ vkCmdSetStencilReference( handle(), faceMask, reference);
}
void VkCommandBufferObj::AddRenderTarget(VkImageObj *renderTarget)
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 0e42cfd..5382210 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -119,9 +119,9 @@
float m_blendConstants[4];
float m_minDepthBounds;
float m_maxDepthBounds;
- uint32_t m_stencilCompareMask;
- uint32_t m_stencilWriteMask;
- uint32_t m_stencilReference;
+ uint32_t m_compareMask;
+ uint32_t m_writeMask;
+ uint32_t m_reference;
std::vector<VkClearValue> m_renderPassClearValues;
VkRenderPassBeginInfo m_renderPassBeginInfo;
vector<VkImageObj*> m_renderTargets;
@@ -195,9 +195,9 @@
void SetDepthBias(float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor);
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);
- void SetStencilReference(VkStencilFaceFlags faceMask, uint32_t stencilReference);
+ void SetStencilReadMask(VkStencilFaceFlags faceMask, uint32_t compareMask);
+ void SetStencilWriteMask(VkStencilFaceFlags faceMask, uint32_t writeMask);
+ void SetStencilReference(VkStencilFaceFlags faceMask, uint32_t reference);
void UpdateBuffer(VkBuffer buffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t *pData);
void CopyImage(VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy* pRegions);
void ResolveImage(VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageResolve* pRegions);
@@ -313,10 +313,10 @@
createView.image = handle();
createView.viewType = VK_IMAGE_VIEW_TYPE_2D;
createView.format = format;
- createView.channels.r = VK_CHANNEL_SWIZZLE_R;
- createView.channels.g = VK_CHANNEL_SWIZZLE_G;
- createView.channels.b = VK_CHANNEL_SWIZZLE_B;
- createView.channels.a = VK_CHANNEL_SWIZZLE_A;
+ createView.channels.r = VK_COMPONENT_SWIZZLE_R;
+ createView.channels.g = VK_COMPONENT_SWIZZLE_G;
+ createView.channels.b = VK_COMPONENT_SWIZZLE_B;
+ createView.channels.a = VK_COMPONENT_SWIZZLE_A;
createView.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
createView.flags = 0;
m_targetView.init(*m_device, createView);
@@ -390,7 +390,7 @@
protected:
VkDeviceObj *m_device;
- vector<VkDescriptorTypeCount> m_type_counts;
+ vector<VkDescriptorPoolSize> m_type_counts;
int m_nextSlot;
vector<VkDescriptorImageInfo> m_imageSamplerDescriptors;
@@ -429,7 +429,7 @@
{
VkPipelineColorBlendAttachmentState att = {};
att.blendEnable = VK_FALSE;
- att.channelWriteMask = 0xf;
+ att.colorWriteMask = 0xf;
AddColorAttachment(0, &att);
}
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 610374a..f288e67 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -334,7 +334,7 @@
queues_[COMPUTE].push_back(new Queue(queue, i));
}
- if (queue_props[i].queueFlags & VK_QUEUE_DMA_BIT) {
+ if (queue_props[i].queueFlags & VK_QUEUE_TRANSFER_BIT) {
queues_[DMA].push_back(new Queue(queue, i));
}
}
@@ -594,7 +594,7 @@
return data;
}
-VkSubresourceLayout Image::subresource_layout(const VkImageSubresourceCopy &subrescopy) const
+VkSubresourceLayout Image::subresource_layout(const VkImageSubresourceLayers &subrescopy) const
{
VkSubresourceLayout data;
VkImageSubresource subres = subresource(image_aspect(subrescopy.aspect), subrescopy.mipLevel, subrescopy.baseArrayLayer);
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 6bfc416..2af0780 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -391,7 +391,7 @@
// vkGetImageSubresourceLayout()
VkSubresourceLayout subresource_layout(const VkImageSubresource &subres) const;
- VkSubresourceLayout subresource_layout(const VkImageSubresourceCopy &subres) const;
+ VkSubresourceLayout subresource_layout(const VkImageSubresourceLayers &subres) const;
bool transparent() const;
bool copyable() const { return (format_features_ & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT); }
@@ -421,8 +421,8 @@
static VkImageAspectFlagBits image_aspect(VkImageAspectFlags flags);
static VkImageSubresource subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer);
static VkImageSubresource subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer);
- static VkImageSubresourceCopy subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer, uint32_t array_size);
- static VkImageSubresourceCopy subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer, uint32_t array_size);
+ static VkImageSubresourceLayers subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer, uint32_t array_size);
+ static VkImageSubresourceLayers subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer, uint32_t array_size);
static VkImageSubresourceRange subresource_range(VkImageAspectFlags aspect_mask, uint32_t base_mip_level, uint32_t mip_levels,
uint32_t base_array_layer, uint32_t num_layers);
static VkImageSubresourceRange subresource_range(const VkImageCreateInfo &info, VkImageAspectFlags aspect_mask);
@@ -692,9 +692,9 @@
return subresource(image_aspect(range.aspectMask), range.baseMipLevel + mip_level, range.baseArrayLayer + array_layer);
}
-inline VkImageSubresourceCopy Image::subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer, uint32_t array_size)
+inline VkImageSubresourceLayers Image::subresource(VkImageAspectFlagBits aspect, uint32_t mip_level, uint32_t array_layer, uint32_t array_size)
{
- VkImageSubresourceCopy subres = {};
+ VkImageSubresourceLayers subres = {};
subres.aspect = aspect;
subres.mipLevel = mip_level;
subres.baseArrayLayer = array_layer;
@@ -723,7 +723,7 @@
return VK_IMAGE_ASPECT_COLOR_BIT;
}
-inline VkImageSubresourceCopy Image::subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer, uint32_t array_size)
+inline VkImageSubresourceLayers Image::subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer, uint32_t array_size)
{
return subresource(image_aspect(range.aspectMask), range.baseMipLevel + mip_level, range.baseArrayLayer + array_layer, array_size);
}