wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d-shader: Rename vkd3d_descriptor_type to vkd3d_shader_descriptor_type.

Browse Source
This commit is contained in:
Józef Kucia 2017-09-07 17:15:54 +02:00
parent efdf2ec691
commit 7416c83ae2
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_shader.h
View File

@ -48,13 +48,13 @@ struct vkd3d_shader_code
size_t size; size_t size;
}; };
enum vkd3d_descriptor_type enum vkd3d_shader_descriptor_type
{ {
VKD3D_DESCRIPTOR_TYPE_UNKNOWN, VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN,
VKD3D_DESCRIPTOR_TYPE_CBV, /* cb# */ VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, /* cb# */
VKD3D_DESCRIPTOR_TYPE_SRV, /* t# */ VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */
VKD3D_DESCRIPTOR_TYPE_UAV, /* u# */ VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */
VKD3D_DESCRIPTOR_TYPE_SAMPLER, /* s# */ VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */
}; };
struct vkd3d_shader_descriptor_binding struct vkd3d_shader_descriptor_binding
@ -65,7 +65,7 @@ struct vkd3d_shader_descriptor_binding
struct vkd3d_shader_resource_binding struct vkd3d_shader_resource_binding
{ {
enum vkd3d_descriptor_type type; enum vkd3d_shader_descriptor_type type;
unsigned int register_index; unsigned int register_index;
bool is_buffer; bool is_buffer;

14
libs/vkd3d-shader/spirv.c
View File

@ -1902,26 +1902,26 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor
enum vkd3d_shader_resource_type resource_type) enum vkd3d_shader_resource_type resource_type)
{ {
const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface;
enum vkd3d_shader_descriptor_type descriptor_type;
struct vkd3d_shader_descriptor_binding vk_binding; struct vkd3d_shader_descriptor_binding vk_binding;
enum vkd3d_descriptor_type descriptor_type;
unsigned int reg_idx = reg->idx[0].offset; unsigned int reg_idx = reg->idx[0].offset;
bool is_buffer_resource; bool is_buffer_resource;
unsigned int i; unsigned int i;
descriptor_type = VKD3D_DESCRIPTOR_TYPE_UNKNOWN; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN;
if (reg->type == VKD3DSPR_CONSTBUFFER) if (reg->type == VKD3DSPR_CONSTBUFFER)
descriptor_type = VKD3D_DESCRIPTOR_TYPE_CBV; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV;
else if (reg->type == VKD3DSPR_RESOURCE) else if (reg->type == VKD3DSPR_RESOURCE)
descriptor_type = VKD3D_DESCRIPTOR_TYPE_SRV; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
else if (reg->type == VKD3DSPR_UAV) else if (reg->type == VKD3DSPR_UAV)
descriptor_type = VKD3D_DESCRIPTOR_TYPE_UAV; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
else if (reg->type == VKD3DSPR_SAMPLER) else if (reg->type == VKD3DSPR_SAMPLER)
descriptor_type = VKD3D_DESCRIPTOR_TYPE_SAMPLER; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER;
else else
FIXME("Unhandled register type %#x.\n", reg->type); FIXME("Unhandled register type %#x.\n", reg->type);
is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER;
if (descriptor_type != VKD3D_DESCRIPTOR_TYPE_UNKNOWN) if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN)
{ {
for (i = 0; i < shader_interface->binding_count; ++i) for (i = 0; i < shader_interface->binding_count; ++i)
{ {

35
libs/vkd3d/state.c
View File

@ -258,38 +258,39 @@ static VkDescriptorType vk_descriptor_type_from_d3d12_root_parameter(D3D12_ROOT_
} }
} }
static enum vkd3d_descriptor_type vkd3d_descriptor_type_from_d3d12_range_type(D3D12_DESCRIPTOR_RANGE_TYPE type) static enum vkd3d_shader_descriptor_type vkd3d_descriptor_type_from_d3d12_range_type(
D3D12_DESCRIPTOR_RANGE_TYPE type)
{ {
switch (type) switch (type)
{ {
case D3D12_DESCRIPTOR_RANGE_TYPE_SRV: case D3D12_DESCRIPTOR_RANGE_TYPE_SRV:
return VKD3D_DESCRIPTOR_TYPE_SRV; return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: case D3D12_DESCRIPTOR_RANGE_TYPE_UAV:
return VKD3D_DESCRIPTOR_TYPE_UAV; return VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: case D3D12_DESCRIPTOR_RANGE_TYPE_CBV:
return VKD3D_DESCRIPTOR_TYPE_CBV; return VKD3D_SHADER_DESCRIPTOR_TYPE_CBV;
case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER:
return VKD3D_DESCRIPTOR_TYPE_SAMPLER; return VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER;
default: default:
FIXME("Unhandled descriptor range type type %#x.\n", type); FIXME("Unhandled descriptor range type type %#x.\n", type);
return VKD3D_DESCRIPTOR_TYPE_SRV; return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
} }
} }
static enum vkd3d_descriptor_type vkd3d_descriptor_type_from_d3d12_root_parameter_type( static enum vkd3d_shader_descriptor_type vkd3d_descriptor_type_from_d3d12_root_parameter_type(
D3D12_ROOT_PARAMETER_TYPE type) D3D12_ROOT_PARAMETER_TYPE type)
{ {
switch (type) switch (type)
{ {
case D3D12_ROOT_PARAMETER_TYPE_SRV: case D3D12_ROOT_PARAMETER_TYPE_SRV:
return VKD3D_DESCRIPTOR_TYPE_SRV; return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
case D3D12_ROOT_PARAMETER_TYPE_UAV: case D3D12_ROOT_PARAMETER_TYPE_UAV:
return VKD3D_DESCRIPTOR_TYPE_UAV; return VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
case D3D12_ROOT_PARAMETER_TYPE_CBV: case D3D12_ROOT_PARAMETER_TYPE_CBV:
return VKD3D_DESCRIPTOR_TYPE_CBV; return VKD3D_SHADER_DESCRIPTOR_TYPE_CBV;
default: default:
FIXME("Unhandled descriptor root parameter type %#x.\n", type); FIXME("Unhandled descriptor root parameter type %#x.\n", type);
return VKD3D_DESCRIPTOR_TYPE_SRV; return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV;
} }
} }
@ -593,7 +594,7 @@ struct vkd3d_descriptor_set_context
}; };
static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature,
enum vkd3d_descriptor_type descriptor_type, unsigned int register_idx, enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_idx,
bool buffer_descriptor, struct vkd3d_descriptor_set_context *context) bool buffer_descriptor, struct vkd3d_descriptor_set_context *context)
{ {
unsigned int i = context->descriptor_index++; unsigned int i = context->descriptor_index++;
@ -606,16 +607,16 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *
} }
static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature,
enum vkd3d_descriptor_type descriptor_type, unsigned int base_register_idx, enum vkd3d_shader_descriptor_type descriptor_type, unsigned int base_register_idx,
unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors, unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors,
struct vkd3d_descriptor_set_context *context) struct vkd3d_descriptor_set_context *context)
{ {
uint32_t first_binding; uint32_t first_binding;
unsigned int i; unsigned int i;
is_buffer_descriptor |= descriptor_type == VKD3D_DESCRIPTOR_TYPE_CBV; is_buffer_descriptor |= descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV;
duplicate_descriptors = (descriptor_type == VKD3D_DESCRIPTOR_TYPE_SRV duplicate_descriptors = (descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV
|| descriptor_type == VKD3D_DESCRIPTOR_TYPE_UAV) || descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
&& duplicate_descriptors; && duplicate_descriptors;
first_binding = context->descriptor_binding; first_binding = context->descriptor_binding;
@ -782,7 +783,7 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa
return hr; return hr;
cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature,
VKD3D_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, context); VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, context);
cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER;
cur_binding->descriptorCount = 1; cur_binding->descriptorCount = 1;
cur_binding->stageFlags = stage_flags_from_visibility(s->ShaderVisibility); cur_binding->stageFlags = stage_flags_from_visibility(s->ShaderVisibility);