wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Create single default sampler per device.

Browse Source
This commit is contained in:
Józef Kucia
2017-09-21 15:12:13 +02:00
parent cfa827b2f8
commit 8cb004bdc4
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libs/vkd3d/state.c
View File

@@ -764,21 +764,10 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign
return S_OK;
}
static HRESULT d3d12_root_signature_create_default_sampler(struct d3d12_root_signature *root_signature,
struct d3d12_device *device, unsigned int index, struct vkd3d_descriptor_set_context *context,
VkDescriptorSetLayoutBinding *binding)
static HRESULT d3d12_root_signature_init_default_sampler(struct d3d12_root_signature *root_signature,
struct d3d12_device *device, struct vkd3d_descriptor_set_context *context)
{
D3D12_STATIC_SAMPLER_DESC sampler_desc;
HRESULT hr;
memset(&sampler_desc, 0, sizeof(sampler_desc));
sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT;
sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;
if (FAILED(hr = vkd3d_create_static_sampler(device, &sampler_desc,
&root_signature->static_samplers[index])))
return hr;
VkDescriptorSetLayoutBinding *binding = context->current_binding;
root_signature->default_sampler.set = context->set_index;
root_signature->default_sampler.binding = context->descriptor_binding++;
@@ -787,7 +776,9 @@ static HRESULT d3d12_root_signature_create_default_sampler(struct d3d12_root_sig
binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
binding->descriptorCount = 1;
binding->stageFlags = VK_SHADER_STAGE_ALL;
binding->pImmutableSamplers = &root_signature->static_samplers[index];
binding->pImmutableSamplers = &device->vk_default_sampler;
++context->current_binding;
return S_OK;
}
@@ -799,6 +790,7 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa
unsigned int i;
HRESULT hr;
assert(root_signature->static_sampler_count == desc->NumStaticSamplers);
for (i = 0; i < desc->NumStaticSamplers; ++i)
{
const D3D12_STATIC_SAMPLER_DESC *s = &desc->pStaticSamplers[i];
@@ -819,14 +811,6 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa
++cur_binding;
}
if (i < root_signature->static_sampler_count)
{
if (FAILED(hr = d3d12_root_signature_create_default_sampler(root_signature, device,
i, context, cur_binding)))
return hr;
++cur_binding;
}
context->current_binding = cur_binding;
return S_OK;
}
@@ -887,6 +871,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
VkDescriptorSetLayoutBinding *binding_desc;
struct d3d12_root_signature_info info;
VkDescriptorSetLayout set_layouts[2];
bool needs_default_sampler;
HRESULT hr;
memset(&context, 0, sizeof(context));
@@ -926,11 +911,11 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
root_signature->root_descriptor_count = info.root_descriptor_count;
/* An additional sampler is created for SpvOpImageFetch. */
if (info.srv_count || info.buffer_srv_count)
needs_default_sampler = info.srv_count || info.buffer_srv_count;
if (needs_default_sampler)
{
++info.sampler_count;
++info.descriptor_count;
++root_signature->static_sampler_count;
}
hr = E_OUTOFMEMORY;
@@ -979,6 +964,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
goto fail;
if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context)))
goto fail;
if (needs_default_sampler && FAILED(hr = d3d12_root_signature_init_default_sampler(root_signature,
device, &context)))
goto fail;
root_signature->main_set = context.set_index;
if (context.descriptor_binding)