wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Store push constant ranges in root signatures.

Browse Source 
In prep for UAV counters support.
This commit is contained in:
Józef Kucia 2017-09-07 17:15:54 +02:00
parent ce8a0290b4
commit bd0c886281
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/vkd3d/state.c
View File

@ -83,8 +83,8 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa
if (root_signature->descriptor_mapping) if (root_signature->descriptor_mapping)
vkd3d_free(root_signature->descriptor_mapping); vkd3d_free(root_signature->descriptor_mapping);
if (root_signature->push_constants) if (root_signature->root_constants)
vkd3d_free(root_signature->push_constants); vkd3d_free(root_signature->root_constants);
for (i = 0; i < root_signature->static_sampler_count; ++i) for (i = 0; i < root_signature->static_sampler_count; ++i)
{ {
@ -492,10 +492,10 @@ static HRESULT d3d12_root_signature_init_descriptor_pool_size(struct d3d12_root_
static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature, static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature,
const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info, const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info,
struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1], struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1],
uint32_t *push_constant_count) uint32_t *push_constant_range_count)
{ {
uint32_t push_constants_offset[D3D12_SHADER_VISIBILITY_PIXEL + 1]; uint32_t push_constants_offset[D3D12_SHADER_VISIBILITY_PIXEL + 1];
unsigned int i, j, push_count; unsigned int i, j, push_constant_count;
uint32_t offset; uint32_t offset;
memset(push_constants, 0, (D3D12_SHADER_VISIBILITY_PIXEL + 1) * sizeof(*push_constants)); memset(push_constants, 0, (D3D12_SHADER_VISIBILITY_PIXEL + 1) * sizeof(*push_constants));
@ -518,7 +518,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat
* "Any two elements of pPushConstantRanges must not include the same * "Any two elements of pPushConstantRanges must not include the same
* stage in stageFlags". * stage in stageFlags".
*/ */
push_count = 1; push_constant_count = 1;
for (i = 0; i <= D3D12_SHADER_VISIBILITY_PIXEL; ++i) for (i = 0; i <= D3D12_SHADER_VISIBILITY_PIXEL; ++i)
{ {
if (i == D3D12_SHADER_VISIBILITY_ALL) if (i == D3D12_SHADER_VISIBILITY_ALL)
@ -543,7 +543,7 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat
++j; ++j;
} }
} }
push_count = j; push_constant_count = j;
} }
for (i = 0, j = 0; i < desc->NumParameters; ++i) for (i = 0, j = 0; i < desc->NumParameters; ++i)
@ -561,25 +561,25 @@ static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signat
return E_NOTIMPL; return E_NOTIMPL;
} }
idx = push_count == 1 ? 0 : p->ShaderVisibility; idx = push_constant_count == 1 ? 0 : p->ShaderVisibility;
offset = push_constants_offset[idx]; offset = push_constants_offset[idx];
push_constants_offset[idx] += p->u.Constants.Num32BitValues * sizeof(uint32_t); push_constants_offset[idx] += p->u.Constants.Num32BitValues * sizeof(uint32_t);
root_signature->parameters[i].parameter_type = p->ParameterType; root_signature->parameters[i].parameter_type = p->ParameterType;
root_constant->stage_flags = push_count == 1 root_constant->stage_flags = push_constant_count == 1
? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility); ? push_constants[0].stageFlags : stage_flags_from_visibility(p->ShaderVisibility);
root_constant->offset = offset; root_constant->offset = offset;
root_signature->push_constants[j].register_index = p->u.Constants.ShaderRegister; root_signature->root_constants[j].register_index = p->u.Constants.ShaderRegister;
root_signature->push_constants[j].shader_visibility root_signature->root_constants[j].shader_visibility
= vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility); = vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility);
root_signature->push_constants[j].offset = offset; root_signature->root_constants[j].offset = offset;
root_signature->push_constants[j].size = p->u.Constants.Num32BitValues * sizeof(uint32_t); root_signature->root_constants[j].size = p->u.Constants.Num32BitValues * sizeof(uint32_t);
++j; ++j;
} }
*push_constant_count = push_count; *push_constant_range_count = push_constant_count;
return S_OK; return S_OK;
} }
@ -854,14 +854,11 @@ static HRESULT vkd3d_create_pipeline_layout(struct d3d12_device *device,
static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signature, static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signature,
struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc) struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc)
{ {
/* Only a single push constant range may include the same stage in Vulkan. */
struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1];
const struct vkd3d_vulkan_info *vk_info = &device->vk_info; const struct vkd3d_vulkan_info *vk_info = &device->vk_info;
struct vkd3d_descriptor_set_context context; struct vkd3d_descriptor_set_context context;
VkDescriptorSetLayoutBinding *binding_desc; VkDescriptorSetLayoutBinding *binding_desc;
struct d3d12_root_signature_info info; struct d3d12_root_signature_info info;
VkDescriptorSetLayout set_layouts[2]; VkDescriptorSetLayout set_layouts[2];
uint32_t push_constant_count;
HRESULT hr; HRESULT hr;
memset(&context, 0, sizeof(context)); memset(&context, 0, sizeof(context));
@ -915,9 +912,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->descriptor_count, if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->descriptor_count,
sizeof(*root_signature->descriptor_mapping)))) sizeof(*root_signature->descriptor_mapping))))
goto fail; goto fail;
root_signature->constant_count = info.root_constant_count; root_signature->root_constant_count = info.root_constant_count;
if (!(root_signature->push_constants = vkd3d_calloc(root_signature->constant_count, if (!(root_signature->root_constants = vkd3d_calloc(root_signature->root_constant_count,
sizeof(*root_signature->push_constants)))) sizeof(*root_signature->root_constants))))
goto fail; goto fail;
if (!(root_signature->static_samplers = vkd3d_calloc(root_signature->static_sampler_count, if (!(root_signature->static_samplers = vkd3d_calloc(root_signature->static_sampler_count,
sizeof(*root_signature->static_samplers)))) sizeof(*root_signature->static_samplers))))
@ -947,7 +944,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
} }
if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, &info, if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, &info,
push_constants, &push_constant_count))) root_signature->push_constant_ranges, &root_signature->push_constant_range_count)))
goto fail; goto fail;
if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context))) if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context)))
goto fail; goto fail;
@ -968,7 +965,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
binding_desc = NULL; binding_desc = NULL;
if (FAILED(hr = vkd3d_create_pipeline_layout(device, context.set_index, set_layouts, if (FAILED(hr = vkd3d_create_pipeline_layout(device, context.set_index, set_layouts,
push_constant_count, push_constants, &root_signature->vk_pipeline_layout))) root_signature->push_constant_range_count, root_signature->push_constant_ranges,
&root_signature->vk_pipeline_layout)))
goto fail; goto fail;
root_signature->device = device; root_signature->device = device;
@ -1177,8 +1175,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device,
shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.bindings = root_signature->descriptor_mapping;
shader_interface.binding_count = root_signature->descriptor_count; shader_interface.binding_count = root_signature->descriptor_count;
shader_interface.push_constants = root_signature->push_constants; shader_interface.push_constants = root_signature->root_constants;
shader_interface.push_constant_count = root_signature->constant_count; shader_interface.push_constant_count = root_signature->root_constant_count;
shader_interface.default_sampler = root_signature->default_sampler; shader_interface.default_sampler = root_signature->default_sampler;
if (FAILED(hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, &shader_interface))) if (FAILED(hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, &shader_interface)))
{ {

8
libs/vkd3d/vkd3d_private.h
View File

@ -343,8 +343,12 @@ struct d3d12_root_signature
struct vkd3d_shader_resource_binding *descriptor_mapping; struct vkd3d_shader_resource_binding *descriptor_mapping;
struct vkd3d_shader_descriptor_binding default_sampler; struct vkd3d_shader_descriptor_binding default_sampler;
unsigned int constant_count; unsigned int root_constant_count;
struct vkd3d_shader_push_constant *push_constants; struct vkd3d_shader_push_constant *root_constants;
unsigned int push_constant_range_count;
/* Only a single push constant range may include the same stage in Vulkan. */
VkPushConstantRange push_constant_ranges[D3D12_SHADER_VISIBILITY_PIXEL + 1];
unsigned int static_sampler_count; unsigned int static_sampler_count;
VkSampler *static_samplers; VkSampler *static_samplers;