February 2021 - Wine-commits

Henri Verbeet : wined3d: Use the format block dimensions to construct the destination box for sub-resource region copies.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 6aa9eec60f9ac75986d81c13594667ef76d1d54c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa9eec60f9ac75986d81c13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:03 2021 +0100 wined3d: Use the format block dimensions to construct the destination box for sub-resource region copies. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 ++--- dlls/wined3d/device.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b690f94af92..43bdec02c0d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28182,9 +28182,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k - ((row_block_count + 1) * dst_format->block_size) / sizeof(colour)]; else expected = initial_data[k]; - todo_wine_if(supported && x == 1 && y == 1) - ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", - src_format->id, dst_format->id, colour, k, expected); + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); if (colour != expected) break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac8d5d78b61..25ef0d1c016 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4694,6 +4694,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev struct wined3d_texture *dst_texture = texture_from_resource(dst_resource); struct wined3d_texture *src_texture = texture_from_resource(src_resource); unsigned int src_level = src_sub_resource_idx % src_texture->level_count; + unsigned int src_row_block_count, src_row_count; if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) { @@ -4741,8 +4742,23 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), - dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + if (src_resource->format->block_width == dst_resource->format->block_width + && src_resource->format->block_height == dst_resource->format->block_height) + { + wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), + dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + } + else + { + src_row_block_count = (src_box->right - src_box->left + src_resource->format->block_width - 1) + / src_resource->format->block_width; + src_row_count = (src_box->bottom - src_box->top + src_resource->format->block_height - 1) + / src_resource->format->block_height; + wined3d_box_set(&dst_box, dst_x, dst_y, + dst_x + (src_row_block_count * dst_resource->format->block_width), + dst_y + (src_row_count * dst_resource->format->block_height), + dst_z, dst_z + (src_box->back - src_box->front)); + } if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) {

1 0

Henri Verbeet : wined3d: Compare resource sizes in blocks in wined3d_device_copy_resource().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 1039bf036f9b98e367abe3a473499ccbdf4371f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1039bf036f9b98e367abe3a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:04 2021 +0100 wined3d: Compare resource sizes in blocks in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/device.c | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43bdec02c0d..21543cd224c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28205,7 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k]; else expected = initial_data[k]; - todo_wine_if(supported) + todo_wine_if(supported && (dst_format->block_edge != 1 + || k >= src_format->block_size / (sizeof(colour)))) ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", src_format->id, dst_format->id, colour, k, expected); if (colour != expected) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 25ef0d1c016..df0f9721e4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4541,7 +4541,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { + unsigned int src_row_block_count, dst_row_block_count; struct wined3d_texture *dst_texture, *src_texture; + unsigned int src_row_count, dst_row_count; struct wined3d_box box; unsigned int i, j; @@ -4561,16 +4563,6 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->width != dst_resource->width - || src_resource->height != dst_resource->height - || src_resource->depth != dst_resource->depth) - { - WARN("Resource dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", - dst_resource->width, dst_resource->height, dst_resource->depth, - src_resource->width, src_resource->height, src_resource->depth); - return; - } - if (!resources_format_compatible(src_resource, dst_resource)) { WARN("Resource formats %s and %s are incompatible.\n", @@ -4579,6 +4571,24 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } + src_row_block_count = (src_resource->width + (src_resource->format->block_width - 1)) + / src_resource->format->block_width; + dst_row_block_count = (dst_resource->width + (dst_resource->format->block_width - 1)) + / dst_resource->format->block_width; + src_row_count = (src_resource->height + (src_resource->format->block_height - 1)) + / src_resource->format->block_height; + dst_row_count = (dst_resource->height + (dst_resource->format->block_height - 1)) + / dst_resource->format->block_height; + + if (src_row_block_count != dst_row_block_count || src_row_count != dst_row_count + || src_resource->depth != dst_resource->depth) + { + WARN("Resource block dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", + dst_row_block_count, dst_row_count, dst_resource->depth, + src_row_block_count, src_row_count, src_resource->depth); + return; + } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1);

1 0

Henri Verbeet : wined3d: Construct a separate source box in wined3d_device_copy_resource().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: fb9ec02e0664c16de9846b15f95093c4cf66afc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb9ec02e0664c16de9846b15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:05 2021 +0100 wined3d: Construct a separate source box in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 ++---- dlls/wined3d/device.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 21543cd224c..fddb7bfd218 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28205,10 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k]; else expected = initial_data[k]; - todo_wine_if(supported && (dst_format->block_edge != 1 - || k >= src_format->block_size / (sizeof(colour)))) - ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", - src_format->id, dst_format->id, colour, k, expected); + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); if (colour != expected) break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df0f9721e4a..a400221ee30 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4544,7 +4544,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, unsigned int src_row_block_count, dst_row_block_count; struct wined3d_texture *dst_texture, *src_texture; unsigned int src_row_count, dst_row_count; - struct wined3d_box box; + struct wined3d_box src_box, dst_box; unsigned int i, j; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -4591,9 +4591,9 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { - wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, - src_resource, 0, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); + wined3d_box_set(&src_box, 0, 0, src_resource->size, 1, 0, 1); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &src_box, + src_resource, 0, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); return; } @@ -4611,13 +4611,14 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, for (i = 0; i < dst_texture->level_count; ++i) { - wined3d_texture_get_level_box(dst_texture, i, &box); + wined3d_texture_get_level_box(src_texture, i, &src_box); + wined3d_texture_get_level_box(dst_texture, i, &dst_box); for (j = 0; j < dst_texture->layer_count; ++j) { unsigned int idx = j * dst_texture->level_count + i; - wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, - src_resource, idx, &box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &dst_box, + src_resource, idx, &src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT); } } }

1 0

David Koolhoven : ntdll: Don't try to convert module to 64-bit if it doesn't contain code.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 4f7a4146cd71c56fdb03412424ebbf1c91b69a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7a4146cd71c56fdb034124… Author: David Koolhoven <david(a)koolhoven-home.net> Date: Wed Feb 10 00:24:49 2021 -0500 ntdll: Don't try to convert module to 64-bit if it doesn't contain code. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50647 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6b76c6f406e..40efd46d3c7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1984,6 +1984,7 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in ULONG i, old_prot; if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + if (!info->ImageContainsCode) return TRUE; /* no need to convert */ TRACE( "%p\n", module );

1 0

Zebediah Figura : winegstreamer: Handle MPEG-1 audio formats in amt_to_wg_format().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: dfeafc74171f116282a4535d4794438bad686771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeafc74171f116282a4535d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:53 2021 -0600 winegstreamer: Handle MPEG-1 audio formats in amt_to_wg_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 82801900a15..0389edc4c13 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -686,6 +686,57 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } +static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEG1WAVEFORMAT *audio_format = (const MPEG1WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + if (audio_format->fwHeadLayer == 1) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1; + else if (audio_format->fwHeadLayer == 2) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2; + else if (audio_format->fwHeadLayer == 3) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + else + return false; + return true; +} + +static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEGLAYER3WAVEFORMAT *audio_format = (const MPEGLAYER3WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + return true; +} + static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *format) { static const struct @@ -750,7 +801,13 @@ static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return amt_to_wg_format_video(mt, format); if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + { + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload)) + return amt_to_wg_format_audio_mpeg1(mt, format); + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MP3)) + return amt_to_wg_format_audio_mpeg1_layer3(mt, format); return amt_to_wg_format_audio(mt, format); + } FIXME("Unknown major type %s.\n", debugstr_guid(&mt->majortype)); return false;

1 0

Zebediah Figura : winegstreamer: Store the current stream format in the wg_parser_stream structure.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 5bff63621eebd269d0765a39418429466dd222f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bff63621eebd269d0765a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:54 2021 -0600 winegstreamer: Store the current stream format in the wg_parser_stream structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0389edc4c13..7c70041000c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - struct wg_format preferred_format; + struct wg_format preferred_format, current_format; pthread_cond_t event_cond, event_empty_cond; struct wg_parser_event event; @@ -2746,6 +2746,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; + bool ret; if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_VideoInfo)) { @@ -2764,6 +2765,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->nAvgBytesPerSec; } + ret = amt_to_wg_format(&pin->pin.pin.mt, &stream->current_format); + assert(ret); stream->enabled = true; gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure());

1 0

Zebediah Figura : vkd3d-shader: Move parse_* structure definitions to hlsl.y.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: vkd3d Branch: master Commit: 3854991154d9961b34c89f3e9d99d46112915212 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3854991154d9961b34c89f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:49 2021 -0600 vkd3d-shader: Move parse_* structure definitions to hlsl.y. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 70 ----------------------------------------- libs/vkd3d-shader/hlsl.y | 81 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 72 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index daa2db2..a3c16c5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -398,76 +398,6 @@ struct hlsl_scope struct hlsl_scope *upper; }; -/* Structures used only during parsing */ -struct parse_parameter -{ - struct hlsl_type *type; - const char *name; - const char *semantic; - const struct hlsl_reg_reservation *reg_reservation; - unsigned int modifiers; -}; - -struct parse_colon_attribute -{ - const char *semantic; - struct hlsl_reg_reservation *reg_reservation; -}; - -struct parse_initializer -{ - struct hlsl_ir_node **args; - unsigned int args_count; - struct list *instrs; -}; - -struct parse_variable_def -{ - struct list entry; - struct source_location loc; - - char *name; - unsigned int array_size; - const char *semantic; - struct hlsl_reg_reservation *reg_reservation; - struct parse_initializer initializer; -}; - -struct parse_function -{ - char *name; - struct hlsl_ir_function_decl *decl; -}; - -struct parse_if_body -{ - struct list *then_instrs; - struct list *else_instrs; -}; - -enum parse_unary_op -{ - UNARY_OP_PLUS, - UNARY_OP_MINUS, - UNARY_OP_LOGICNOT, - UNARY_OP_BITNOT, -}; - -enum parse_assign_op -{ - ASSIGN_OP_ASSIGN, - ASSIGN_OP_ADD, - ASSIGN_OP_SUB, - ASSIGN_OP_MUL, - ASSIGN_OP_DIV, - ASSIGN_OP_MOD, - ASSIGN_OP_LSHIFT, - ASSIGN_OP_RSHIFT, - ASSIGN_OP_AND, - ASSIGN_OP_OR, - ASSIGN_OP_XOR, -}; - struct hlsl_parse_ctx { const char **source_files; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c97ce05..5c3160f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -19,10 +19,87 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%{ + +%code requires +{ + #include "hlsl.h" #include <stdio.h> +struct parse_parameter +{ + struct hlsl_type *type; + const char *name; + const char *semantic; + const struct hlsl_reg_reservation *reg_reservation; + unsigned int modifiers; +}; + +struct parse_colon_attribute +{ + const char *semantic; + struct hlsl_reg_reservation *reg_reservation; +}; + +struct parse_initializer +{ + struct hlsl_ir_node **args; + unsigned int args_count; + struct list *instrs; +}; + +struct parse_variable_def +{ + struct list entry; + struct source_location loc; + + char *name; + uint32_t array_size; + const char *semantic; + struct hlsl_reg_reservation *reg_reservation; + struct parse_initializer initializer; +}; + +struct parse_function +{ + char *name; + struct hlsl_ir_function_decl *decl; +}; + +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + +enum parse_unary_op +{ + UNARY_OP_PLUS, + UNARY_OP_MINUS, + UNARY_OP_LOGICNOT, + UNARY_OP_BITNOT, +}; + +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + +} + +%code +{ + int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; @@ -1504,7 +1581,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, return statements_list; } -%} +} %locations %define parse.error verbose

1 0

Zebediah Figura : vkd3d-shader: Move hlsl_ctx initialization and cleanup to hlsl_compile_shader().
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: vkd3d Branch: master Commit: 74007172825bf70b80c331c7e158701ee2b5222d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74007172825bf70b80c331c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:50 2021 -0600 vkd3d-shader: Move hlsl_ctx initialization and cleanup to hlsl_compile_shader(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 182 ++++++++++++++++++++++++++++++++++++++++++----- libs/vkd3d-shader/hlsl.h | 11 ++- libs/vkd3d-shader/hlsl.l | 5 +- libs/vkd3d-shader/hlsl.y | 153 +++------------------------------------ 4 files changed, 180 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=74007172825bf70b80c…

1 0

Zebediah Figura : vkd3d-shader: Use a table to initialize predefined effect types.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: vkd3d Branch: master Commit: af47cc5b5371fbcebff8740b79e73585533d9382 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af47cc5b5371fbcebff8740… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:51 2021 -0600 vkd3d-shader: Use a table to initialize predefined effect types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e3d1110..43072c2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1378,8 +1378,9 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry) static void declare_predefined_types(struct hlsl_scope *scope) { + unsigned int x, y, bt, i; struct hlsl_type *type; - unsigned int x, y, bt; + static const char * const names[] = { "float", @@ -1400,6 +1401,25 @@ static void declare_predefined_types(struct hlsl_scope *scope) "samplerCUBE" }; + static const struct + { + char name[13]; + enum hlsl_type_class class; + enum hlsl_base_type base_type; + unsigned int dimx, dimy; + } + effect_types[] = + { + {"DWORD", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1}, + {"FLOAT", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, + {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, + {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, + {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, + {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, + {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, + {"VERTEXSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, + }; + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { for (y = 1; y <= 4; ++y) @@ -1438,23 +1458,12 @@ static void declare_predefined_types(struct hlsl_scope *scope) hlsl_ctx.builtin_types.Void = hlsl_new_type(vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); - /* DX8 effects predefined types */ - type = hlsl_new_type(vkd3d_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); - hlsl_scope_add_type(scope, type); - type = hlsl_new_type(vkd3d_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); - hlsl_scope_add_type(scope, type); + for (i = 0; i < ARRAY_SIZE(effect_types); ++i) + { + type = hlsl_new_type(vkd3d_strdup(effect_types[i].name), effect_types[i].class, + effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); + hlsl_scope_add_type(scope, type); + } } static bool hlsl_ctx_init(struct hlsl_parse_ctx *ctx, struct vkd3d_shader_message_context *message_context)

1 0

Zebediah Figura : vkd3d-shader: Use struct source_location as the Bison location type.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: vkd3d Branch: master Commit: f1acb3d3836724f2fbfd9a8739e567d1873f7d01 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1acb3d3836724f2fbfd9a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 4 16:33:52 2021 -0600 vkd3d-shader: Use struct source_location as the Bison location type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.l | 17 ++-- libs/vkd3d-shader/hlsl.y | 211 +++++++++++++++++++++-------------------------- 2 files changed, 104 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f1acb3d3836724f2fbf…

1 0