wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Filter out unsupported object types.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-04-19 04:05:00 +02:00 committed by Alexandre Julliard
parent 9bbed14987
commit 1a79d1e945
Notes: Alexandre Julliard 2024-05-08 22:49:51 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/802
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/vkd3d-shader/fx.c
View File

@ -1122,7 +1122,7 @@ static void write_buffers(struct fx_write_context *fx)
} }
} }
static bool is_object_variable(const struct hlsl_ir_var *var) static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struct hlsl_ir_var *var)
{ {
const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type);
@ -1133,7 +1133,13 @@ static bool is_object_variable(const struct hlsl_ir_var *var)
case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_RENDER_TARGET_VIEW:
case HLSL_CLASS_SAMPLER: case HLSL_CLASS_SAMPLER:
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
return true;
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
if (ctx->profile->major_version < 5)
return false;
if (type->e.resource.rasteriser_ordered)
return false;
return true;
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
return true; return true;
@ -1144,14 +1150,15 @@ static bool is_object_variable(const struct hlsl_ir_var *var)
static void write_objects(struct fx_write_context *fx, bool shared) static void write_objects(struct fx_write_context *fx, bool shared)
{ {
struct hlsl_ctx *ctx = fx->ctx;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
if (shared && !fx->child_effect) if (shared && !fx->child_effect)
return; return;
LIST_FOR_EACH_ENTRY(var, &fx->ctx->extern_vars, struct hlsl_ir_var, extern_entry) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{ {
if (!is_object_variable(var)) if (!is_supported_object_variable(ctx, var))
continue; continue;
if (fx->child_effect && (shared != !!(var->storage_modifiers & HLSL_STORAGE_SHARED))) if (fx->child_effect && (shared != !!(var->storage_modifiers & HLSL_STORAGE_SHARED)))