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

vkd3d-shader: Add descriptors from SAMPLE instructions if necessary.

Browse Source 
This has no effect now, but will once we start lowering sm1 texturing
instructions before vsir_program_scan() is called.
This commit is contained in:
Elizabeth Figura
2025-08-06 12:06:14 -05:00
committed by Henri Verbeet
parent f6d0c689ee
commit 2201c32e6d
Notes: Henri Verbeet 2025-08-07 20:51:20 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1670
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@@ -1233,6 +1233,40 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co
s->sampler_index = sampler_idx; s->sampler_index = sampler_idx;
} }
static void vkd3d_shader_scan_sample_instruction(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler)
{
unsigned int resource_idx = resource->idx[0].offset;
unsigned int sampler_idx = sampler->idx[0].offset;
vkd3d_shader_scan_combined_sampler_usage(context, resource, sampler);
if (!context->scan_descriptor_info)
return;
/* Sample instructions lowered from 1.x texture instructions have no
* DCL, so we need to add the resource if it didn't already exist.
* Such descriptors have a fixed count, type, etc. */
if (!vkd3d_shader_find_descriptor(context->scan_descriptor_info,
VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource_idx))
{
struct vkd3d_shader_register_range range = {.first = resource_idx, .last = resource_idx};
vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, resource,
&range, VKD3D_SHADER_RESOURCE_TEXTURE_2D, VSIR_DATA_F32);
}
if (!vkd3d_shader_find_descriptor(context->scan_descriptor_info,
VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler_idx))
{
struct vkd3d_shader_register_range range = {.first = sampler_idx, .last = sampler_idx};
vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, resource,
&range, VKD3D_SHADER_RESOURCE_NONE, VSIR_DATA_UNUSED);
}
}
static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context,
const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type,
enum vsir_data_type resource_data_type, unsigned int sample_count, enum vsir_data_type resource_data_type, unsigned int sample_count,
@@ -1459,7 +1493,6 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte
break; break;
case VSIR_OP_GATHER4: case VSIR_OP_GATHER4:
case VSIR_OP_GATHER4_C: case VSIR_OP_GATHER4_C:
case VSIR_OP_SAMPLE:
case VSIR_OP_SAMPLE_B: case VSIR_OP_SAMPLE_B:
case VSIR_OP_SAMPLE_C: case VSIR_OP_SAMPLE_C:
case VSIR_OP_SAMPLE_C_LZ: case VSIR_OP_SAMPLE_C_LZ:
@@ -1467,6 +1500,9 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte
case VSIR_OP_SAMPLE_LOD: case VSIR_OP_SAMPLE_LOD:
vkd3d_shader_scan_combined_sampler_usage(context, &instruction->src[1].reg, &instruction->src[2].reg); vkd3d_shader_scan_combined_sampler_usage(context, &instruction->src[1].reg, &instruction->src[2].reg);
break; break;
case VSIR_OP_SAMPLE:
vkd3d_shader_scan_sample_instruction(context, &instruction->src[1].reg, &instruction->src[2].reg);
break;
case VSIR_OP_GATHER4_PO: case VSIR_OP_GATHER4_PO:
case VSIR_OP_GATHER4_PO_C: case VSIR_OP_GATHER4_PO_C:
vkd3d_shader_scan_combined_sampler_usage(context, &instruction->src[2].reg, &instruction->src[3].reg); vkd3d_shader_scan_combined_sampler_usage(context, &instruction->src[2].reg, &instruction->src[3].reg);