KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk/vulkan.h: Rename count to arraySize in VkDescriptorSetLayoutBinding

This commit is contained in:
Jason Ekstrand 2015-07-06 17:43:58 -07:00
parent d84f3155b1
commit 63c1190e47
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vulkan/vulkan.h
View File

@ -1573,7 +1573,7 @@ typedef struct {
typedef struct {
VkDescriptorType descriptorType;
uint32_t count;
uint32_t arraySize;
VkShaderStageFlags stageFlags;
const VkSampler* pImmutableSamplers;
} VkDescriptorSetLayoutBinding;

16
src/vulkan/device.c
View File

@ -1645,7 +1645,7 @@ VkResult anv_CreateDescriptorSetLayout(
case VK_DESCRIPTOR_TYPE_SAMPLER:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
for_each_bit(s, pCreateInfo->pBinding[i].stageFlags)
sampler_count[s] += pCreateInfo->pBinding[i].count;
sampler_count[s] += pCreateInfo->pBinding[i].arraySize;
break;
default:
break;
@ -1662,7 +1662,7 @@ VkResult anv_CreateDescriptorSetLayout(
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
for_each_bit(s, pCreateInfo->pBinding[i].stageFlags)
surface_count[s] += pCreateInfo->pBinding[i].count;
surface_count[s] += pCreateInfo->pBinding[i].arraySize;
break;
default:
break;
@ -1671,14 +1671,14 @@ VkResult anv_CreateDescriptorSetLayout(
switch (pCreateInfo->pBinding[i].descriptorType) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
num_dynamic_buffers += pCreateInfo->pBinding[i].count;
num_dynamic_buffers += pCreateInfo->pBinding[i].arraySize;
break;
default:
break;
}
stages |= pCreateInfo->pBinding[i].stageFlags;
count += pCreateInfo->pBinding[i].count;
count += pCreateInfo->pBinding[i].arraySize;
}
uint32_t sampler_total = 0;
@ -1719,7 +1719,7 @@ VkResult anv_CreateDescriptorSetLayout(
case VK_DESCRIPTOR_TYPE_SAMPLER:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
for_each_bit(s, pCreateInfo->pBinding[i].stageFlags)
for (uint32_t j = 0; j < pCreateInfo->pBinding[i].count; j++) {
for (uint32_t j = 0; j < pCreateInfo->pBinding[i].arraySize; j++) {
sampler[s]->index = descriptor + j;
sampler[s]->dynamic_slot = -1;
sampler[s]++;
@ -1750,7 +1750,7 @@ VkResult anv_CreateDescriptorSetLayout(
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
for_each_bit(s, pCreateInfo->pBinding[i].stageFlags)
for (uint32_t j = 0; j < pCreateInfo->pBinding[i].count; j++) {
for (uint32_t j = 0; j < pCreateInfo->pBinding[i].arraySize; j++) {
surface[s]->index = descriptor + j;
if (is_dynamic)
surface[s]->dynamic_slot = dynamic_slot + j;
@ -1764,9 +1764,9 @@ VkResult anv_CreateDescriptorSetLayout(
}
if (is_dynamic)
dynamic_slot += pCreateInfo->pBinding[i].count;
dynamic_slot += pCreateInfo->pBinding[i].arraySize;
descriptor += pCreateInfo->pBinding[i].count;
descriptor += pCreateInfo->pBinding[i].arraySize;
}
*pSetLayout = (VkDescriptorSetLayout) set_layout;

2
src/vulkan/meta.c
View File

@ -415,7 +415,7 @@ anv_device_init_meta_blit_state(struct anv_device *device)
.pBinding = (VkDescriptorSetLayoutBinding[]) {
{
.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
.count = 1,
.arraySize = 1,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.pImmutableSamplers = NULL
},