wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zebediah Figura : ws2_32: Close the new socket handle on CF_DEFER.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 3d521bc7b9b8265b70206471cf5c9e40f791230f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d521bc7b9b8265b70206471… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 23:01:14 2021 -0500 ws2_32: Close the new socket handle on CF_DEFER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9cbe7908226..b3dab22ae6e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3541,6 +3541,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_DEFER, &server_handle, sizeof(server_handle), NULL, 0 ); + closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); return -1; }

1 0

Zebediah Figura : server: Avoid leaking the poll output buffer if the request is terminated irregularly (Valgrind).
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 567beb6b2edba07051a75d45a9b2f1516568c0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=567beb6b2edba07051a75d45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 23:01:13 2021 -0500 server: Avoid leaking the poll output buffer if the request is terminated irregularly (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index 2b85b2889f0..03716cba90f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -795,6 +795,7 @@ static void free_poll_req( void *private ) release_object( req->async ); release_object( req->iosb ); list_remove( &req->entry ); + free( req->output ); free( req ); } @@ -849,6 +850,7 @@ static void complete_async_poll( struct poll_req *req, unsigned int status ) /* pass 0 as result; client will set actual result size */ async_request_complete( req->async, status, 0, req->count * sizeof(*req->output), req->output ); + req->output = NULL; } static void complete_async_polls( struct sock *sock, int event, int error )

1 0

Zebediah Figura : server: Do not allocate a connect_req structure for nonblocking sockets (Valgrind).
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: wine Branch: master Commit: 60dd202fbdcf5022a91720ac946531a2a0d12bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60dd202fbdcf5022a91720ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 23:01:12 2021 -0500 server: Do not allocate a connect_req structure for nonblocking sockets (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7b00cb3f4f4..2b85b2889f0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2289,9 +2289,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!send_len) return; } - if (!(req = mem_alloc( sizeof(*req) ))) - return; - sock->state = SOCK_CONNECTING; if (params->synchronous && sock->nonblocking) @@ -2301,6 +2298,9 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + if (!(req = mem_alloc( sizeof(*req) ))) + return; + req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->sock = (struct sock *)grab_object( sock );

1 0

Alexandre Julliard : packaging: Add support for syncing vkd3d packages.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: tools Branch: master Commit: 56de07bc1e75d3249375decc3072124596038c7c URL: https://source.winehq.org/git/tools.git/?a=commit;h=56de07bc1e75d3249375dec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 21:05:23 2021 +0200 packaging: Add support for syncing vkd3d packages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt.cfg | 2 +- packaging/obs/obs-sync | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/packaging/obs/apt.cfg b/packaging/obs/apt.cfg index 28e6a54..c4b3690 100644 --- a/packaging/obs/apt.cfg +++ b/packaging/obs/apt.cfg @@ -1,7 +1,7 @@ APT::FTPArchive::Release { Origin dl.winehq.org; Label winehq; - Architectures "i386 amd64"; + Architectures "i386 amd64 all"; Description "WineHQ packages"; Components main; } diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index c74b7fe..2c624ef 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -70,7 +70,12 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/ + if test "$arch" = all + then + rsync -aq $obsdir/$arch/${all_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/ + else + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/ + fi done dscverify -u $obsdir/$source_pkg\~$2-$build.dsc if test -f $obsdir/$source_pkg\~$2-$build.diff.gz @@ -208,11 +213,24 @@ do debver=${1/-rc/~rc} case "$2" in "") echo "Branch not specified for version $1"; exit 1 ;; - staging) source_pkg="wine-staging_$debver" ;; - *) source_pkg="wine_$debver" ;; + vkd3d) + wine_pkg="vkd3d-*" + winehq_pkg="libvkd3d*" + all_pkg="libvkd3d*" + source_pkg="vkd3d_$debver" + deb_archs="$deb_archs all" + ;; + staging) + wine_pkg="wine-staging*" + winehq_pkg="winehq-staging" + source_pkg="wine-staging_$debver" + ;; + *) + wine_pkg="wine-$2*" + winehq_pkg="winehq-$2" + source_pkg="wine_$debver" + ;; esac - wine_pkg="wine-$2*" - winehq_pkg="winehq-$2" shift rsync -aq --delete --exclude-from=rsync-filter --link-dest=$winehq_dir $winehq_dir/ dest

1 0

Alexandre Julliard : packaging: Allow specifying the build id for Debian packages.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: tools Branch: master Commit: db6817f62d03f5c51bf1b49c7294a465ae017e8d URL: https://source.winehq.org/git/tools.git/?a=commit;h=db6817f62d03f5c51bf1b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 21:04:58 2021 +0200 packaging: Allow specifying the build id for Debian packages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index d3bb585..c74b7fe 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -70,14 +70,14 @@ add_deb () test -d $dstdir || mkdir -p $dstdir for arch in $deb_archs do - rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-1_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-1_$arch.deb $dstdir/binary-$arch/ + rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/ done - dscverify -u $obsdir/$source_pkg\~$2-1.dsc - if test -f $obsdir/$source_pkg\~$2-1.diff.gz + dscverify -u $obsdir/$source_pkg\~$2-$build.dsc + if test -f $obsdir/$source_pkg\~$2-$build.diff.gz then - rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.diff.gz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ else - rsync -aq $obsdir/$source_pkg\~$2-1.dsc $obsdir/$source_pkg\~$2-1.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ + rsync -aq $obsdir/$source_pkg\~$2-$build.dsc $obsdir/$source_pkg\~$2-$build.debian.tar.xz $obsdir/$source_pkg\~$2.orig.tar.gz $dstdir/source/ fi if test -n "$4" @@ -181,10 +181,15 @@ cd $basedir distros="33 34 buster bullseye bookworm bionic focal hirsute" dry_run= +build=1 while [ $# -ge 1 ] do case "$1" in + -b) + build="$2" + shift + ;; -d) distros="$2" shift

1 0

Alexandre Julliard : packaging: Use a separate apt-ftparchive cache for each distro.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: tools Branch: master Commit: 1cbf1279ae2d20303356776393ea17db8bdeefd2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1cbf1279ae2d20303356776… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 21:03:41 2021 +0200 packaging: Use a separate apt-ftparchive cache for each distro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 094c4c5..d3bb585 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -11,8 +11,6 @@ winehq_dir=/home/ftp/pub/wine-builds deb_archs="i386 amd64" rpm_archs="i686 x86_64 src" -apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d $basedir/.cache/apt-cache.db -s $basedir/apt-override" - # compress a file while keeping the original compress_file () { @@ -137,6 +135,7 @@ EOF index_deb () { dest=dest/$1/dists/$2 + apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d $basedir/.cache/apt-cache-$2.db -s $basedir/apt-override" for arch in $deb_archs do @@ -163,7 +162,6 @@ publish_files () diff -ur --no-dereference $winehq_dir dest >diffs || true rsync -av --delete-after --delay-updates --exclude-from=rsync-filter --link-dest=$(pwd)/dest dest/ $winehq_dir - cp .cache/apt-cache.db .cache/apt-cache.db.backup # purge the download cache for symlinked directories for i in debian/dists/stable debian/dists/testing

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the Load() method.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: vkd3d Branch: master Commit: cd2df526e14cd2fca702c418d437ec29bb1f5d59 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cd2df526e14cd2fca702c41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 21:58:57 2021 -0500 vkd3d-shader/hlsl: Parse the Load() method. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 48 +++++++++++++++++- libs/vkd3d-shader/hlsl.h | 26 +++++++++- libs/vkd3d-shader/hlsl.y | 102 ++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 14 ++++++ libs/vkd3d-shader/hlsl_sm1.c | 5 ++ libs/vkd3d-shader/hlsl_sm4.c | 5 ++ 6 files changed, 196 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cd2df526e14cd2fca70…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle texture types in hlsl_type_to_string().
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: vkd3d Branch: master Commit: aafe776401578b2700244d4e9a9dd122aeaf0895 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aafe776401578b2700244d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 21:58:56 2021 -0500 vkd3d-shader/hlsl: Handle texture types in hlsl_type_to_string(). 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index aecc4a6..e0f26c0 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -893,6 +893,37 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru vkd3d_string_buffer_printf(string, "<anonymous struct>"); return string; + case HLSL_CLASS_OBJECT: + { + static const char dimensions[5][HLSL_SAMPLER_DIM_MAX + 1] = + { + [HLSL_SAMPLER_DIM_1D] = "1D", + [HLSL_SAMPLER_DIM_2D] = "2D", + [HLSL_SAMPLER_DIM_3D] = "3D", + [HLSL_SAMPLER_DIM_CUBE] = "Cube" + }; + + switch (type->base_type) + { + case HLSL_TYPE_TEXTURE: + if (type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + { + vkd3d_string_buffer_printf(string, "Texture"); + return string; + } + + assert(type->sampler_dim < ARRAY_SIZE(dimensions)); + assert(type->e.resource_format->base_type < ARRAY_SIZE(base_types)); + vkd3d_string_buffer_printf(string, "Texture%s<%s%u>", dimensions[type->sampler_dim], + base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); + return string; + + default: + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; + } + } + default: vkd3d_string_buffer_printf(string, "<unexpected type>"); return string;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse explicitly typed texture types.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: vkd3d Branch: master Commit: a56c294abeb292927e7c57a2009ae7016519bf0e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a56c294abeb292927e7c57a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 21:58:55 2021 -0500 vkd3d-shader/hlsl: Parse explicitly typed texture types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 25 ++++++++++++++++++------ libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.y | 49 +++++++++++++++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6462ce8..aecc4a6 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,7 +261,7 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format) { struct hlsl_type *type; @@ -272,6 +272,7 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ type->dimx = 4; type->dimy = 1; type->sampler_dim = dim; + type->e.resource_format = format; list_add_tail(&ctx->types, &type->entry); return type; } @@ -344,9 +345,14 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) - return false; + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + { + if (t1->sampler_dim != t2->sampler_dim) + return false; + if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + && !hlsl_types_are_equal(t1->e.resource_format, t2->e.resource_format)) + return false; + } if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) return false; @@ -742,6 +748,8 @@ void hlsl_pop_scope(struct hlsl_ctx *ctx) static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) { + int r; + if (t1->type != t2->type) { if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR) @@ -752,7 +760,13 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls 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) - return t1->sampler_dim - t2->sampler_dim; + { + if (t1->sampler_dim != t2->sampler_dim) + return t1->sampler_dim - t2->sampler_dim; + if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) + return r; + } if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; if (t1->dimy != t2->dimy) @@ -761,7 +775,6 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls { struct list *t1cur, *t2cur; struct hlsl_struct_field *t1field, *t2field; - int r; t1cur = list_head(t1->e.elements); t2cur = list_head(t2->e.elements); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 65c6f34..64a90ff 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -126,6 +126,7 @@ struct hlsl_type struct hlsl_type *type; unsigned int elements_count; } array; + struct hlsl_type *resource_format; } e; unsigned int reg_size; @@ -655,7 +656,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b814995..32dd418 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1789,6 +1789,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type struct parse_colon_attribute colon_attribute; struct hlsl_semantic semantic; enum hlsl_buffer_type buffer_type; + enum hlsl_sampler_dim sampler_dim; } %token KW_BLENDSTATE @@ -1963,6 +1964,8 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type %type <reg_reservation> register_opt +%type <sampler_dim> texture_type + %type <semantic> semantic %type <type> field_type @@ -2376,6 +2379,24 @@ input_mod: $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; } +texture_type: + KW_TEXTURE1D + { + $$ = HLSL_SAMPLER_DIM_1D; + } + | KW_TEXTURE2D + { + $$ = HLSL_SAMPLER_DIM_2D; + } + | KW_TEXTURE3D + { + $$ = HLSL_SAMPLER_DIM_3D; + } + | KW_TEXTURECUBE + { + $$ = HLSL_SAMPLER_DIM_CUBE; + } + type: KW_VECTOR '<' type ',' C_INTEGER '>' { @@ -2453,23 +2474,25 @@ type: } | KW_TEXTURE { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); - } - | KW_TEXTURE1D - { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC, NULL); } - | KW_TEXTURE2D + | texture_type { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + $$ = hlsl_new_texture_type(ctx, $1, ctx->builtin_types.vector[HLSL_TYPE_FLOAT][4 - 1]); } - | KW_TEXTURE3D + | texture_type '<' type '>' { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); - } - | KW_TEXTURECUBE - { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + if ($3->type > HLSL_CLASS_VECTOR) + { + struct vkd3d_string_buffer *string; + + string = hlsl_type_to_string(ctx, $3); + if (string) + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Texture data type %s is not scalar or vector.\n", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + $$ = hlsl_new_texture_type(ctx, $1, $3); } | TYPE_IDENTIFIER {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Lex the Texture* keywords.
by Alexandre Julliard 08 Oct '21

08 Oct '21

Module: vkd3d Branch: master Commit: a318f36e59429115bd7472044fafc2fe2000472e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a318f36e59429115bd74720… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 21:58:54 2021 -0500 vkd3d-shader/hlsl: Lex the Texture* keywords. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index f8ff283..762a8a0 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -121,14 +121,18 @@ technique {return KW_TECHNIQUE; } technique10 {return KW_TECHNIQUE10; } texture {return KW_TEXTURE; } texture1D {return KW_TEXTURE1D; } +Texture1D {return KW_TEXTURE1D; } Texture1DArray {return KW_TEXTURE1DARRAY; } texture2D {return KW_TEXTURE2D; } +Texture2D {return KW_TEXTURE2D; } Texture2DArray {return KW_TEXTURE2DARRAY; } Texture2DMS {return KW_TEXTURE2DMS; } Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } texture3D {return KW_TEXTURE3D; } +Texture3D {return KW_TEXTURE3D; } Texture3DArray {return KW_TEXTURE3DARRAY; } textureCUBE {return KW_TEXTURECUBE; } +TextureCube {return KW_TEXTURECUBE; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } uniform {return KW_UNIFORM; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021