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

vkd3d-shader/hlsl: Add offset parameter to 'Load' method.

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
This commit is contained in:
Francisco Casas 2022-04-05 17:28:09 -04:00 committed by Alexandre Julliard
parent 609632279f
commit 8e07423ba1
Notes: Alexandre Julliard 2022-10-18 00:13:00 +02:00 
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/9
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/vkd3d-shader/hlsl.y
View File

@ -2541,26 +2541,38 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
&& object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY) && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY)
{ {
const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim);
const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim);
struct hlsl_ir_resource_load *load; struct hlsl_ir_resource_load *load;
struct hlsl_ir_node *offset = NULL;
struct hlsl_ir_node *coords; struct hlsl_ir_node *coords;
bool multisampled;
if (object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS multisampled = object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS
|| object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY) || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY;
{
FIXME("'Load' method for multi-sample textures.\n");
return false;
}
if (params->args_count < 1 || params->args_count > 3) if (params->args_count < 1 + multisampled || params->args_count > 3 + multisampled)
{ {
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT,
"Wrong number of arguments to method 'Load': expected 1, 2, or 3, but got %u.", params->args_count); "Wrong number of arguments to method 'Load': expected between %u and %u, but got %u.",
1 + multisampled, 3 + multisampled, params->args_count);
return false; return false;
} }
if (params->args_count >= 2) if (multisampled)
hlsl_fixme(ctx, loc, "Offset parameter."); {
if (params->args_count == 3) hlsl_fixme(ctx, loc, "Load() sampling index parameter.");
}
assert(offset_dim);
if (params->args_count > 1 + multisampled)
{
if (!(offset = add_implicit_conversion(ctx, instrs, params->args[1 + multisampled],
hlsl_get_vector_type(ctx, HLSL_TYPE_INT, offset_dim), loc)))
return false;
}
if (params->args_count > 2 + multisampled)
{
hlsl_fixme(ctx, loc, "Tiled resource status argument."); hlsl_fixme(ctx, loc, "Tiled resource status argument.");
}
/* +1 for the mipmap level */ /* +1 for the mipmap level */
if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0],
@ -2568,7 +2580,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
return false; return false;
if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD,
&object_load->src, NULL, coords, NULL, loc))) &object_load->src, NULL, coords, offset, loc)))
return false; return false;
list_add_tail(instrs, &load->node.entry); list_add_tail(instrs, &load->node.entry);
return true; return true;