fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vk: Create and bind a sampler in vk.c

Browse source
This commit is contained in:
Kristian Høgsberg 2015-05-13 13:55:43 -07:00
parent 18acfa7301
commit 5c9d77600b
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/vulkan/vk.c
View file

@ -285,7 +285,7 @@ int main(int argc, char *argv[])
vkCreateDescriptorSetLayout(device,
&(VkDescriptorSetLayoutCreateInfo) {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
.count = 2,
.count = 3,
.pBinding = (VkDescriptorSetLayoutBinding[]) {
{
.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
@ -298,6 +298,12 @@ int main(int argc, char *argv[])
.count = 1,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.pImmutableSamplers = NULL
},
{
.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER,
.count = 1,
.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
.pImmutableSamplers = NULL
}
}
},
@ -561,7 +567,26 @@ int main(int argc, char *argv[])
0, /* allocation index; for objects which need to bind to multiple mems */
mem, 2048 + 256 * 256 * 4);
vkUpdateDescriptors(device, set[0], 2,
VkSampler sampler;
vkCreateSampler(device,
&(VkSamplerCreateInfo) {
.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
.magFilter = VK_TEX_FILTER_LINEAR,
.minFilter = VK_TEX_FILTER_LINEAR,
.mipMode = VK_TEX_MIPMAP_MODE_NEAREST,
.addressU = VK_TEX_ADDRESS_CLAMP,
.addressV = VK_TEX_ADDRESS_CLAMP,
.addressW = VK_TEX_ADDRESS_CLAMP,
.mipLodBias = 0,
.maxAnisotropy = 0,
.compareOp = VK_COMPARE_OP_GREATER,
.minLod = 0,
.maxLod = 0,
.borderColor = VK_BORDER_COLOR_TRANSPARENT_BLACK
},
&sampler);
vkUpdateDescriptors(device, set[0], 3,
(const void * []) {
&(VkUpdateBuffers) {
.sType = VK_STRUCTURE_TYPE_UPDATE_BUFFERS,
@ -592,6 +617,12 @@ int main(int argc, char *argv[])
.layout = VK_IMAGE_LAYOUT_GENERAL,
}
}
},
&(const VkUpdateSamplers) {
.sType = VK_STRUCTURE_TYPE_UPDATE_SAMPLERS,
.binding = 3,
.count = 1,
.pSamplers = (const VkSampler[]) { sampler }
}
});