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: Pass push constants mapping to shader compiler.

Browse Source
This commit is contained in:
Józef Kucia
2017-07-28 10:19:37 +02:00
parent 56b68c486c
commit e074c30dc7
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d/state.c
View File

@@ -76,6 +76,8 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa
vkd3d_free(root_signature->descriptor_mapping); vkd3d_free(root_signature->descriptor_mapping);
if (root_signature->constants) if (root_signature->constants)
vkd3d_free(root_signature->constants); vkd3d_free(root_signature->constants);
if (root_signature->push_constants)
vkd3d_free(root_signature->push_constants);
for (i = 0; i < root_signature->static_sampler_count; ++i) for (i = 0; i < root_signature->static_sampler_count; ++i)
{ {
@@ -406,6 +408,12 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
goto fail; goto fail;
} }
if (!(root_signature->push_constants = vkd3d_calloc(root_signature->constant_count,
sizeof(*root_signature->push_constants))))
{
hr = E_OUTOFMEMORY;
goto fail;
}
/* Map root constants to push constants. */ /* Map root constants to push constants. */
for (i = 0, j = 0; i < desc->NumParameters; ++i) for (i = 0, j = 0; i < desc->NumParameters; ++i)
@@ -430,6 +438,10 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
root_signature->constants[j].stage_flags = push_constants[j].stageFlags; root_signature->constants[j].stage_flags = push_constants[j].stageFlags;
root_signature->constants[j].offset = push_constants[j].offset; root_signature->constants[j].offset = push_constants[j].offset;
root_signature->push_constants[j].register_index = p->u.Constants.ShaderRegister;
root_signature->push_constants[j].offset = 0;
root_signature->push_constants[j].count = p->u.Constants.Num32BitValues;
++j; ++j;
} }
@@ -831,7 +843,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device,
{ {
struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength};
if (FAILED(hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, if (FAILED(hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0,
root_signature->descriptor_mapping, root_signature->descriptor_count, NULL, 0))) root_signature->descriptor_mapping, root_signature->descriptor_count,
root_signature->push_constants, root_signature->constant_count)))
{ {
WARN("Failed to compile shader, hr %#x.\n", hr); WARN("Failed to compile shader, hr %#x.\n", hr);
return hr; return hr;

1
libs/vkd3d/vkd3d_private.h
View File

@@ -286,6 +286,7 @@ struct d3d12_root_signature
unsigned int constant_count; unsigned int constant_count;
struct d3d12_root_constant *constants; struct d3d12_root_constant *constants;
struct vkd3d_shader_push_constant *push_constants;
unsigned int static_sampler_count; unsigned int static_sampler_count;
VkSampler *static_samplers; VkSampler *static_samplers;