January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 10/24] mfplay/tests: Avoid "misleading indentation" warnings.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH vkd3d v5 3/6] vkd3d-shader/hlsl: Handle additional dimension types for textures.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.c | 25 ++++++++++++--------- > libs/vkd3d-shader/hlsl.h | 16 ++++++++++++-- > libs/vkd3d-shader/hlsl_sm4.c | 43 ++++++++++++++++++++++-------------- > 3 files changed, 55 insertions(+), 29 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c > index e96969d1..8a0f4b01 100644 > --- a/libs/vkd3d-shader/hlsl.c > +++ b/libs/vkd3d-shader/hlsl.c > @@ -932,10 +932,15 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru > { > static const char *const dimensions[] = > { > - [HLSL_SAMPLER_DIM_1D] = "1D", > - [HLSL_SAMPLER_DIM_2D] = "2D", > - [HLSL_SAMPLER_DIM_3D] = "3D", > - [HLSL_SAMPLER_DIM_CUBE] = "Cube" > + [HLSL_SAMPLER_DIM_1D] = "1D", > + [HLSL_SAMPLER_DIM_2D] = "2D", > + [HLSL_SAMPLER_DIM_3D] = "3D", > + [HLSL_SAMPLER_DIM_CUBE] = "Cube", > + [HLSL_SAMPLER_DIM_1DARRAY] = "1DArray", > + [HLSL_SAMPLER_DIM_2DARRAY] = "2DArray", > + [HLSL_SAMPLER_DIM_2DMS] = "2DMS", > + [HLSL_SAMPLER_DIM_2DMSARRAY] = "2DMSArray", > + [HLSL_SAMPLER_DIM_CUBEARRAY] = "CubeArray", > }; > > switch (type->base_type) > @@ -1778,11 +1783,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) > > static const char *const sampler_names[] = > { > - "sampler", > - "sampler1D", > - "sampler2D", > - "sampler3D", > - "samplerCUBE" > + [HLSL_SAMPLER_DIM_GENERIC] = "sampler", > + [HLSL_SAMPLER_DIM_1D] = "sampler1D", > + [HLSL_SAMPLER_DIM_2D] = "sampler2D", > + [HLSL_SAMPLER_DIM_3D] = "sampler3D", > + [HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", > }; > > static const struct > @@ -1834,7 +1839,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) > } > } > > - for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) > + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) > { > type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); > type->sampler_dim = bt; > diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h > index 3dfeea1d..8f365abb 100644 > --- a/libs/vkd3d-shader/hlsl.h > +++ b/libs/vkd3d-shader/hlsl.h > @@ -98,7 +98,13 @@ enum hlsl_sampler_dim > HLSL_SAMPLER_DIM_2D, > HLSL_SAMPLER_DIM_3D, > HLSL_SAMPLER_DIM_CUBE, > - HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE > + HLSL_SAMPLER_DIM_LAST_SAMPLER = HLSL_SAMPLER_DIM_CUBE, > + HLSL_SAMPLER_DIM_1DARRAY, > + HLSL_SAMPLER_DIM_2DARRAY, > + HLSL_SAMPLER_DIM_2DMS, > + HLSL_SAMPLER_DIM_2DMSARRAY, > + HLSL_SAMPLER_DIM_CUBEARRAY, > + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, > }; > > enum hlsl_matrix_majority > @@ -487,7 +493,7 @@ struct hlsl_ctx > struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; > /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ > struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; > - struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; > + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_LAST_SAMPLER + 1]; > struct hlsl_type *Void; > } builtin_types; > > @@ -673,11 +679,17 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) > { > case HLSL_SAMPLER_DIM_1D: > return 1; > + case HLSL_SAMPLER_DIM_1DARRAY: > case HLSL_SAMPLER_DIM_2D: > + case HLSL_SAMPLER_DIM_2DMS: > return 2; > + case HLSL_SAMPLER_DIM_2DARRAY: > + case HLSL_SAMPLER_DIM_2DMSARRAY: > case HLSL_SAMPLER_DIM_3D: > case HLSL_SAMPLER_DIM_CUBE: > return 3; > + case HLSL_SAMPLER_DIM_CUBEARRAY: > + return 4; > default: > assert(0); > return 0; > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index 4eebd583..d62a1bed 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -434,6 +434,16 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ > return D3D_SRV_DIMENSION_TEXTURE3D; > case HLSL_SAMPLER_DIM_CUBE: > return D3D_SRV_DIMENSION_TEXTURECUBE; > + case HLSL_SAMPLER_DIM_1DARRAY: > + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; > + case HLSL_SAMPLER_DIM_2DARRAY: > + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; > + case HLSL_SAMPLER_DIM_2DMS: > + return D3D_SRV_DIMENSION_TEXTURE2DMS; > + case HLSL_SAMPLER_DIM_2DMSARRAY: > + return D3D_SRV_DIMENSION_TEXTURE2DMSARRAY; > + case HLSL_SAMPLER_DIM_CUBEARRAY: > + return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; > default: > assert(0); > return D3D_SRV_DIMENSION_UNKNOWN; > @@ -721,6 +731,16 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ > return VKD3D_SM4_RESOURCE_TEXTURE_3D; > case HLSL_SAMPLER_DIM_CUBE: > return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; > + case HLSL_SAMPLER_DIM_1DARRAY: > + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; > + case HLSL_SAMPLER_DIM_2DARRAY: > + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; > + case HLSL_SAMPLER_DIM_2DMS: > + return VKD3D_SM4_RESOURCE_TEXTURE_2DMS; > + case HLSL_SAMPLER_DIM_2DMSARRAY: > + return VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY; > + case HLSL_SAMPLER_DIM_CUBEARRAY: > + return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; > default: > assert(0); > return 0; > @@ -1307,6 +1327,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf > const struct hlsl_deref *resource, const struct hlsl_ir_node *coords) > { > struct sm4_instruction instr; > + unsigned int dim_count; > > memset(&instr, 0, sizeof(instr)); > instr.opcode = VKD3D_SM4_OP_LD; > @@ -1318,23 +1339,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf > > /* Mipmap level is in the last component in the IR, but needs to be in the W > * component in the instruction. */ > - switch (resource_type->sampler_dim) > - { > - case HLSL_SAMPLER_DIM_1D: > - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); > - break; > - > - case HLSL_SAMPLER_DIM_2D: > - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); > - break; > - > - case HLSL_SAMPLER_DIM_3D: > - case HLSL_SAMPLER_DIM_CUBE: > - break; > - > - case HLSL_SAMPLER_DIM_GENERIC: > - assert(0); > - } > + dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim); > + if (dim_count == 1) > + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); > + if (dim_count == 2) > + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); > > sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask); >

Jan. 28, 2022

Re: [PATCH vkd3d v5 6/6] vkd3d-shader/hlsl: Parse valid texture array types.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > > Multisampled objects, namely Texture2DMS and Texture2DMSArray are > not parsed yet since they require a different type of declaration, > with the number of samples stated expicitly. > > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.l | 1 + > libs/vkd3d-shader/hlsl.y | 13 +++++++++++++ > 2 files changed, 14 insertions(+) > > diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l > index a37e5d88..c1edfe7e 100644 > --- a/libs/vkd3d-shader/hlsl.l > +++ b/libs/vkd3d-shader/hlsl.l > @@ -133,6 +133,7 @@ texture3D {return KW_TEXTURE3D; } > Texture3D {return KW_TEXTURE3D; } > textureCUBE {return KW_TEXTURECUBE; } > TextureCube {return KW_TEXTURECUBE; } > +TextureCubeArray {return KW_TEXTURECUBEARRAY; } > true {return KW_TRUE; } > typedef {return KW_TYPEDEF; } > uniform {return KW_UNIFORM; } > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index ec688764..42cad016 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -2138,6 +2138,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > %token KW_TEXTURE2DMSARRAY > %token KW_TEXTURE3D > %token KW_TEXTURECUBE > +%token KW_TEXTURECUBEARRAY > %token KW_TRUE > %token KW_TYPEDEF > %token KW_UNIFORM > @@ -2682,6 +2683,18 @@ texture_type: > { > $$ = HLSL_SAMPLER_DIM_CUBE; > } > + | KW_TEXTURE1DARRAY > + { > + $$ = HLSL_SAMPLER_DIM_1DARRAY; > + } > + | KW_TEXTURE2DARRAY > + { > + $$ = HLSL_SAMPLER_DIM_2DARRAY; > + } > + | KW_TEXTURECUBEARRAY > + { > + $$ = HLSL_SAMPLER_DIM_CUBEARRAY; > + } > > type: > KW_VECTOR '<' type ',' C_INTEGER '>'

Jan. 28, 2022

Re: [PATCH vkd3d v5 4/6] vkd3d-shader/hlsl: Check texture dimension type on method calls.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > > --- > > Note that for multi-sampled textures (and only for multi-sampled > textures) the Load method requires the sample index as argument > 2, and thus, can accept from 3 to 4 arguments. > > While multi-sampled textures won't be parsed yet, I added a FIXME > as a reminder that the behaviour is rather different, this also > allowed to be more precise in the succesive fixmes. > > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.y | 25 +++++++++++++++++++++---- > 1 file changed, 21 insertions(+), 4 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index 18126032..2f1bd447 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -1837,12 +1837,21 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > /* Only HLSL_IR_LOAD can return an object. */ > object_load = hlsl_ir_load(object); > > - if (!strcmp(name, "Load")) > + if (!strcmp(name, "Load") > + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBE > + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY) > { > const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > struct hlsl_ir_resource_load *load; > struct hlsl_ir_node *coords; > > + if (object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS > + || 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) > { > hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, > @@ -1850,7 +1859,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > return false; > } > if (params->args_count >= 2) > - FIXME("Ignoring index and/or offset parameter(s).\n"); > + hlsl_fixme(ctx, loc, "Offset parameter."); > + if (params->args_count == 3) > + hlsl_fixme(ctx, loc, "Tiled resource status argument."); > > /* +1 for the mipmap level */ > if (!(coords = add_implicit_conversion(ctx, instrs, params->args[0], > @@ -1863,7 +1874,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > list_add_tail(instrs, &load->node.entry); > return true; > } > - else if (!strcmp(name, "Sample")) > + else if (!strcmp(name, "Sample") > + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS > + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) > { > const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > const struct hlsl_type *sampler_type; > @@ -1913,8 +1926,12 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > list_add_tail(instrs, &load->node.entry); > return true; > } > - else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") > + else if ((!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") > || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) > + && (object_type->sampler_dim == HLSL_SAMPLER_DIM_2D > + || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DARRAY > + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBE > + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBEARRAY)) > { > const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > enum hlsl_resource_load_type load_type;

Jan. 28, 2022

Re: [PATCH vkd3d v5 2/6] vkd3d-shader/hlsl: Move sampler_dim_count() to hlsl.h.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.h | 17 +++++++++++++++++ > libs/vkd3d-shader/hlsl.y | 23 +++-------------------- > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h > index 2319895a..3dfeea1d 100644 > --- a/libs/vkd3d-shader/hlsl.h > +++ b/libs/vkd3d-shader/hlsl.h > @@ -667,6 +667,23 @@ static inline struct hlsl_type *hlsl_get_numeric_type(const struct hlsl_ctx *ctx > return hlsl_get_matrix_type(ctx, base_type, dimx, dimy); > } > > +static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) > +{ > + switch (dim) > + { > + case HLSL_SAMPLER_DIM_1D: > + return 1; > + case HLSL_SAMPLER_DIM_2D: > + return 2; > + case HLSL_SAMPLER_DIM_3D: > + case HLSL_SAMPLER_DIM_CUBE: > + return 3; > + default: > + assert(0); > + return 0; > + } > +} > + > const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); > const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); > const char *debug_hlsl_writemask(unsigned int writemask); > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > index 9476765f..18126032 100644 > --- a/libs/vkd3d-shader/hlsl.y > +++ b/libs/vkd3d-shader/hlsl.y > @@ -1513,23 +1513,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t > return statements_list; > } > > -static unsigned int sampler_dim_count(enum hlsl_sampler_dim dim) > -{ > - switch (dim) > - { > - case HLSL_SAMPLER_DIM_1D: > - return 1; > - case HLSL_SAMPLER_DIM_2D: > - return 2; > - case HLSL_SAMPLER_DIM_3D: > - case HLSL_SAMPLER_DIM_CUBE: > - return 3; > - default: > - assert(0); > - return 0; > - } > -} > - > struct find_function_call_args > { > const struct parse_initializer *params; > @@ -1856,7 +1839,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > > if (!strcmp(name, "Load")) > { > - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); > + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > struct hlsl_ir_resource_load *load; > struct hlsl_ir_node *coords; > > @@ -1882,7 +1865,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > } > else if (!strcmp(name, "Sample")) > { > - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); > + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > const struct hlsl_type *sampler_type; > struct hlsl_ir_resource_load *load; > struct hlsl_ir_node *offset = NULL; > @@ -1933,7 +1916,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") > || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) > { > - const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); > + const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); > enum hlsl_resource_load_type load_type; > const struct hlsl_type *sampler_type; > struct hlsl_ir_resource_load *load;

Jan. 28, 2022

Re: [PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Il 27/01/22 19:31, Francisco Casas ha scritto: > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c > index 917c7bf7..e96969d1 100644 > --- a/libs/vkd3d-shader/hlsl.c > +++ b/libs/vkd3d-shader/hlsl.c > @@ -794,8 +794,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls > } > if (t1->base_type != t2->base_type) > return t1->base_type - t2->base_type; > - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) > - && t1->sampler_dim != t2->sampler_dim) > + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) > { > if (t1->sampler_dim != t2->sampler_dim) > return t1->sampler_dim - t2->sampler_dim;

Jan. 28, 2022

Re: [PATCH 18/24] nsi/tests: Avoid "misleading indentation" warnings.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 28, 2022

Re: [PATCH 03/24] gdi32/tests: Avoid "misleading indentation" warnings.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 28, 2022

[PATCH vkd3d v4 6/6] vkd3d-shader/hlsl: Parse bitwise OR.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea13f4e7..cee682f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3611,7 +3611,7 @@ bitor_expr: bitxor_expr | bitor_expr '|' bitxor_expr { - hlsl_fixme(ctx, &@$, "Bitwise OR."); + $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_OR, &@2); } logicand_expr: -- 2.34.1

Jan. 28, 2022

[PATCH vkd3d v4 5/6] vkd3d-shader/hlsl: Parse bitwise XOR.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 13268617..ea13f4e7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3604,7 +3604,7 @@ bitxor_expr: bitand_expr | bitxor_expr '^' bitand_expr { - hlsl_fixme(ctx, &@$, "Bitwise XOR."); + $$ = add_binary_bitwise_expr_merge(ctx, $1, $3, HLSL_OP2_BIT_XOR, &@2); } bitor_expr: -- 2.34.1

Jan. 28, 2022