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: Rename vkd3d_shader_next_stage_info to vkd3d_shader_varying_map_info.

Browse Source 
It was originally intended that this structure could hold other information
about the next stage which compilation might depend on. For example, compilation
to GLSL needs to know the type of the next shader in some circumstances.

That was never actualized, and since the API is fixed at this point for 1.9, it
makes the most sense to rename the structure to match its actual scope.

The documentation was written and arranged to imply that the structure would
hold other information about the next shader than the varying map; this is
changed accordingly as well.
This commit is contained in:
Zebediah Figura
2023-09-19 16:04:53 -05:00
committed by Alexandre Julliard
parent 46c7f65be8
commit fd120d8f2d
Notes: Alexandre Julliard 2023-09-21 22:01:59 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/356
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/vkd3d-shader/ir.c
View File

@@ -86,14 +86,14 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i
}
static const struct vkd3d_shader_varying_map *find_varying_map(
const struct vkd3d_shader_next_stage_info *next_stage, unsigned int signature_idx)
const struct vkd3d_shader_varying_map_info *varying_map, unsigned int signature_idx)
{
unsigned int i;
for (i = 0; i < next_stage->varying_count; ++i)
for (i = 0; i < varying_map->varying_count; ++i)
{
if (next_stage->varying_map[i].output_signature_index == signature_idx)
return &next_stage->varying_map[i];
if (varying_map->varying_map[i].output_signature_index == signature_idx)
return &varying_map->varying_map[i];
}
return NULL;
@@ -103,15 +103,15 @@ static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *pars
const struct vkd3d_shader_compile_info *compile_info)
{
struct shader_signature *signature = &parser->shader_desc.output_signature;
const struct vkd3d_shader_next_stage_info *next_stage;
const struct vkd3d_shader_varying_map_info *varying_map;
unsigned int i;
if (!(next_stage = vkd3d_find_struct(compile_info->next, NEXT_STAGE_INFO)))
if (!(varying_map = vkd3d_find_struct(compile_info->next, VARYING_MAP_INFO)))
return VKD3D_OK;
for (i = 0; i < signature->element_count; ++i)
{
const struct vkd3d_shader_varying_map *map = find_varying_map(next_stage, i);
const struct vkd3d_shader_varying_map *map = find_varying_map(varying_map, i);
struct signature_element *e = &signature->elements[i];
if (map)
@@ -137,9 +137,9 @@ static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *pars
}
}
for (i = 0; i < next_stage->varying_count; ++i)
for (i = 0; i < varying_map->varying_count; ++i)
{
if (next_stage->varying_map[i].output_signature_index >= signature->element_count)
if (varying_map->varying_map[i].output_signature_index >= signature->element_count)
{
vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED,
"Aborting due to not yet implemented feature: "