September 2020 - Wine-Commits

Kevin Puetz : oleaut32: FUNC_DISPATCH from dispinterface should have oVft == 0.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 03b1b3920c666807aab4c143ba8209442d38ccee URL: https://source.winehq.org/git/wine.git/?a=commit;h=03b1b3920c666807aab4c143… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Sep 28 10:52:51 2020 +0100 oleaut32: FUNC_DISPATCH from dispinterface should have oVft == 0. A dispinterface has no vtbl beyond IDispatch itself. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 06667850a3..540d91f2eb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2465,7 +2465,10 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; ptfd->funcdesc.cParams = pFuncRec->nrargs ; ptfd->funcdesc.cParamsOpt = pFuncRec->nroargs ; - ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if (ptfd->funcdesc.funckind == FUNC_DISPATCH) + ptfd->funcdesc.oVft = 0; + else + ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -4179,7 +4182,10 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, pFuncDesc->funcdesc.callconv = pFunc->nacc & 0x7; pFuncDesc->funcdesc.cParams = pFunc->nacc >> 3; pFuncDesc->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; + if (pFuncDesc->funcdesc.funckind == FUNC_DISPATCH) + pFuncDesc->funcdesc.oVft = 0; + else + pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags;

1 0

Alexandre Julliard : packaging: Remove Debian 9.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: tools Branch: master Commit: c8db1d57d79be45ca48ece935ee9c758d31486ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=c8db1d57d79be45ca48ece9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 11:28:25 2020 +0200 packaging: Remove Debian 9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index fcea1b3..790a9cd 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -14,10 +14,6 @@ set _tilde 0 # ############# end config ############## -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_9… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_9… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_9… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_10 ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 6092d03..bb2477a 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -180,7 +180,7 @@ publish_files () cd $basedir -distros="31 32 stretch buster bullseye xenial bionic focal" +distros="31 32 buster bullseye xenial bionic focal" dry_run= while [ $# -ge 1 ] @@ -216,7 +216,6 @@ do do case $i in 31|32) add_rpm $i Fedora_$i ;; - stretch) add_deb debian stretch Debian_9.0 oldstable ;; buster) add_deb debian buster Debian_10 stable ;; bullseye) add_deb debian bullseye Debian_Testing_standard testing ;; xenial) add_deb ubuntu xenial xUbuntu_16.04 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 58292f5..6c06d8f 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -5,10 +5,8 @@ + /debian + /debian/dists -+ /debian/dists/oldstable + /debian/dists/stable + /debian/dists/testing -+ /debian/dists/stretch + /debian/dists/buster + /debian/dists/bullseye - /debian/dists/*

1 0

Alexandre Julliard : packaging: Update Android build script for non-recursive makefile.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: tools Branch: master Commit: ef2f11ce37c87f8c23b5a236bb655234abdee5af URL: https://source.winehq.org/git/tools.git/?a=commit;h=ef2f11ce37c87f8c23b5a23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 11:29:03 2020 +0200 packaging: Update Android build script for non-recursive makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index 68fea8e..c2147ae 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -275,7 +275,7 @@ install_all () $install -m 644 $sourcedir/LICENSE.txt assets-tmp/LICENSE.txt mv assets-tmp $destdir/assets - (cd $destdir && gradle -q -Psrcdir=../../$srcdir/dlls/wineandroid.drv -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) + (cd $destdir && gradle -q -Psrcdir=../../$srcdir -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug) mv $destdir/build/outputs/apk/wine-debug.apk ../../wine-${release:-debug}-$arch.apk }

1 0

Isabella Bosia : vkd3d-shader: Add valid vkd3d_sm4_data_type types.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: 8d9d20d47b3a851412d53f151095f08c87afb82d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d9d20d47b3a851412d53f1… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Sat Sep 26 01:05:36 2020 +0100 vkd3d-shader: Add valid vkd3d_sm4_data_type types. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 30 +++++++++++++++++++----------- libs/vkd3d-shader/trace.c | 22 +++++++++++++--------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++++ 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 398cd9f..371ea13 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -433,11 +433,15 @@ enum vkd3d_sm4_resource_type enum vkd3d_sm4_data_type { - VKD3D_SM4_DATA_UNORM = 0x1, - VKD3D_SM4_DATA_SNORM = 0x2, - VKD3D_SM4_DATA_INT = 0x3, - VKD3D_SM4_DATA_UINT = 0x4, - VKD3D_SM4_DATA_FLOAT = 0x5, + VKD3D_SM4_DATA_UNORM = 0x1, + VKD3D_SM4_DATA_SNORM = 0x2, + VKD3D_SM4_DATA_INT = 0x3, + VKD3D_SM4_DATA_UINT = 0x4, + VKD3D_SM4_DATA_FLOAT = 0x5, + VKD3D_SM4_DATA_MIXED = 0x6, + VKD3D_SM4_DATA_DOUBLE = 0x7, + VKD3D_SM4_DATA_CONTINUED = 0x8, + VKD3D_SM4_DATA_UNUSED = 0x9, }; enum vkd3d_sm4_sampler_mode @@ -522,12 +526,16 @@ static const enum vkd3d_shader_resource_type resource_type_table[] = static const enum vkd3d_data_type data_type_table[] = { - /* 0 */ VKD3D_DATA_FLOAT, - /* VKD3D_SM4_DATA_UNORM */ VKD3D_DATA_UNORM, - /* VKD3D_SM4_DATA_SNORM */ VKD3D_DATA_SNORM, - /* VKD3D_SM4_DATA_INT */ VKD3D_DATA_INT, - /* VKD3D_SM4_DATA_UINT */ VKD3D_DATA_UINT, - /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, + /* 0 */ VKD3D_DATA_FLOAT, + /* VKD3D_SM4_DATA_UNORM */ VKD3D_DATA_UNORM, + /* VKD3D_SM4_DATA_SNORM */ VKD3D_DATA_SNORM, + /* VKD3D_SM4_DATA_INT */ VKD3D_DATA_INT, + /* VKD3D_SM4_DATA_UINT */ VKD3D_DATA_UINT, + /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, + /* VKD3D_SM4_DATA_MIXED */ VKD3D_DATA_MIXED, + /* VKD3D_SM4_DATA_DOUBLE */ VKD3D_DATA_DOUBLE, + /* VKD3D_SM4_DATA_CONTINUED */ VKD3D_DATA_CONTINUED, + /* VKD3D_SM4_DATA_UNUSED */ VKD3D_DATA_UNUSED, }; static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2d758b6..6049ee1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -530,15 +530,19 @@ static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d { static const char *const data_type_names[] = { - /* VKD3D_DATA_FLOAT */ "float", - /* VKD3D_DATA_INT */ "int", - /* VKD3D_DATA_RESOURCE */ "resource", - /* VKD3D_DATA_SAMPLER */ "sampler", - /* VKD3D_DATA_UAV */ "uav", - /* VKD3D_DATA_UINT */ "uint", - /* VKD3D_DATA_UNORM */ "unorm", - /* VKD3D_DATA_SNORM */ "snorm", - /* VKD3D_DATA_OPAQUE */ "opaque", + /* VKD3D_DATA_FLOAT */ "float", + /* VKD3D_DATA_INT */ "int", + /* VKD3D_DATA_RESOURCE */ "resource", + /* VKD3D_DATA_SAMPLER */ "sampler", + /* VKD3D_DATA_UAV */ "uav", + /* VKD3D_DATA_UINT */ "uint", + /* VKD3D_DATA_UNORM */ "unorm", + /* VKD3D_DATA_SNORM */ "snorm", + /* VKD3D_DATA_OPAQUE */ "opaque", + /* VKD3D_DATA_MIXED */ "mixed", + /* VKD3D_DATA_DOUBLE */ "double", + /* VKD3D_DATA_CONTINUED */ "<continued>", + /* VKD3D_DATA_UNUSED */ "<unused>", }; const char *name; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ec0014e..71eb80d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -394,6 +394,10 @@ enum vkd3d_data_type VKD3D_DATA_UNORM, VKD3D_DATA_SNORM, VKD3D_DATA_OPAQUE, + VKD3D_DATA_MIXED, + VKD3D_DATA_DOUBLE, + VKD3D_DATA_CONTINUED, + VKD3D_DATA_UNUSED, }; enum vkd3d_immconst_type

1 0

Zebediah Figura : vkd3d-shader: Introduce vkd3d_shader_preprocess().
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: f1cc186f18db860cc4100d2652d263b337eeea04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1cc186f18db860cc4100d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 25 16:53:01 2020 -0500 vkd3d-shader: Introduce vkd3d_shader_preprocess(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 157 ++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++ 3 files changed, 166 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 9fd2836..85588bc 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -54,6 +54,12 @@ enum vkd3d_shader_structure_type /** The structure is a vkd3d_shader_transform_feedback_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, + /** + * The structure is a vkd3d_shader_preprocess_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -611,6 +617,128 @@ struct vkd3d_shader_spirv_domain_shader_target_info enum vkd3d_shader_tessellator_partitioning partitioning; }; +/** + * A single preprocessor macro, passed as part of struct + * vkd3d_shader_preprocess_info. + */ +struct vkd3d_shader_macro +{ + /** + * A null-terminated string containing the name of a macro. This macro must + * not be a parameterized (i.e. function-like) macro. If this field is not a + * valid macro identifier, it will be ignored. + */ + const char *name; + /** A null-terminated string containing the expansion of the macro. */ + const char *value; +}; + +/** + * Type of a callback function which will be used to open preprocessor includes. + * + * This callback function is passed as part of struct + * vkd3d_shader_preprocess_info. + * + * If this function fails, vkd3d-shader will emit a compilation error, and the + * \a pfn_close_include callback will not be called. + * + * \param filename Unquoted string used as an argument to the \#include + * directive. + * + * \param local Whether the \#include directive is requesting a local (i.e. + * double-quoted) or system (i.e. angle-bracketed) include. + * + * \param parent_data Unprocessed source code of the file in which this + * \#include directive is evaluated. This parameter may be NULL. + * + * \param context The user-defined pointer passed to struct + * vkd3d_shader_preprocess_info. + * + * \param out Output location for the full contents of the included file. The + * code need not be allocated using standard vkd3d functions, but must remain + * valid until the corresponding call to \a pfn_close_include. If this function + * fails, the contents of this parameter are ignored. + * + * \return A member of \ref vkd3d_result. + */ +typedef int (*PFN_vkd3d_shader_open_include)(const char *filename, bool local, + const char *parent_data, void *context, struct vkd3d_shader_code *out); +/** + * Type of a callback function which will be used to close preprocessor + * includes. + * + * This callback function is passed as part of struct + * vkd3d_shader_preprocess_info. + * + * \param code Contents of the included file, which were allocated by the + * \ref PFN_vkd3d_shader_open_include callback. The source code was allocated by + * the user and thus need not be freed by vkd3d_shader_free_shader_code(). + * + * \param context The user-defined pointer passed to struct + * vkd3d_shader_preprocess_info. + */ +typedef void (*PFN_vkd3d_shader_close_include)(const struct vkd3d_shader_code *code, void *context); + +/** + * A chained structure containing preprocessing parameters. + * + * This structure is optional. + * + * This structure extends vkd3d_shader_compile_info. + * + * This structure contains only input parameters. + * + * \since 1.3 + */ +struct vkd3d_shader_preprocess_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of predefined macros. Each macro in this array will + * be expanded as if a corresponding #define statement were prepended to the + * source code. + * + * If the same macro is specified multiple times, only the first value is + * used. + */ + const struct vkd3d_shader_macro *macros; + /** Size, in elements, of \ref macros. */ + unsigned int macro_count; + + /** + * Optional pointer to a callback function, which will be called in order to + * evaluate \#include directives. The function receives parameters + * corresponding to the directive's arguments, and should return the + * complete text of the included file. + * + * If this field is set to NULL, or if this structure is omitted, + * vkd3d-shader will attempt to open included files using POSIX file APIs. + * + * If this field is set to NULL, the \ref pfn_close_include field must also + * be set to NULL. + */ + PFN_vkd3d_shader_open_include pfn_open_include; + /** + * Optional pointer to a callback function, which will be called whenever an + * included file is closed. This function will be called exactly once for + * each successful call to \ref pfn_open_include, and should be used to free + * any resources allocated thereby. + * + * If this field is set to NULL, the \ref pfn_open_include field must also + * be set to NULL. + */ + PFN_vkd3d_shader_close_include pfn_close_include; + /** + * User-defined pointer which will be passed unmodified to the + * \ref pfn_open_include and \ref pfn_close_include callbacks. + */ + void *include_context; +}; + /* root signature 1.0 */ enum vkd3d_shader_filter { @@ -1454,6 +1582,35 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( */ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); +/* 1.3 */ + +/** + * Preprocess the given source code. + * + * This function supports the following chained structures: + * - vkd3d_shader_preprocess_info + * + * \param compile_info A chained structure containing compilation parameters. + * + * \param out A pointer to a vkd3d_shader_code structure in which the + * preprocessed code will be stored. + * \n + * The preprocessed shader is allocated by vkd3d-shader and should be freed with + * vkd3d_shader_free_shader_code() when no longer needed. + * + * \param messages Optional output location for error or informational messages + * produced by the compiler. + * \n + * This parameter behaves identically to the \a messages parameter of + * vkd3d_shader_compile(). + * + * \return A member of \ref vkd3d_result. + * + * \since 1.3 + */ +int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, char **messages); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 1937131..2e49fe2 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -14,6 +14,7 @@ global: vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; + vkd3d_shader_preprocess; vkd3d_shader_scan; vkd3d_shader_serialize_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0c6a3c3..a1bd3fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1141,3 +1141,11 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( return NULL; } } + +int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, char **messages) +{ + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); + + return VKD3D_ERROR_NOT_IMPLEMENTED; +}

1 0

Zebediah Figura : vkd3d-shader: Introduce struct vkd3d_shader_hlsl_source_info.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: cbe4a3adff9452084616ac659ee73f7baa46e6e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cbe4a3adff9452084616ac6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 25 16:53:02 2020 -0500 vkd3d-shader: Introduce struct vkd3d_shader_hlsl_source_info. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 85588bc..7b95896 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -54,6 +54,11 @@ enum vkd3d_shader_structure_type /** The structure is a vkd3d_shader_transform_feedback_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, + /** + * The structure is a vkd3d_shader_hlsl_source_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO, /** * The structure is a vkd3d_shader_preprocess_info structure. * \since 1.3 @@ -739,6 +744,39 @@ struct vkd3d_shader_preprocess_info void *include_context; }; +/** + * A chained structure containing HLSL compilation parameters. + * + * This structure is optional. + * + * This structure extends vkd3d_shader_compile_info. + * + * This structure contains only input parameters. + * + * \since 1.3 + */ +struct vkd3d_shader_hlsl_source_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Optional pointer to a null-terminated string containing the shader entry + * point. + * + * If this parameter is NULL, vkd3d-shader uses the entry point "main". + */ + const char *entry_point; + struct vkd3d_shader_code secondary_code; + /** + * Pointer to a null-terminated string containing the target shader + * profile. + */ + const char *profile; +}; + /* root signature 1.0 */ enum vkd3d_shader_filter {

1 0

Isabella Bosia : vkd3d-shader: Parse all 4 data type components.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: 9136e56435e90ab6b068d17aa505c96a99295e3d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9136e56435e90ab6b068d17… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Sat Sep 26 01:05:37 2020 +0100 vkd3d-shader: Parse all 4 data type components. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 52 ++++++++++++++++++++------------ libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 24 ++++++++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 5 files changed, 63 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 371ea13..93e7eaf 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -122,6 +122,8 @@ #define VKD3D_SM4_CONDITIONAL_NZ (0x1u << 18) +#define VKD3D_SM4_TYPE_COMPONENT(com, i) (((com) >> (4 * (i))) & 0xfu) + enum vkd3d_sm4_opcode { VKD3D_SM4_OP_ADD = 0x00, @@ -623,6 +625,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; DWORD components; + unsigned int i; resource_type = (opcode_token & VKD3D_SM4_RESOURCE_TYPE_MASK) >> VKD3D_SM4_RESOURCE_TYPE_SHIFT; if (!resource_type || (resource_type >= ARRAY_SIZE(resource_type_table))) @@ -639,18 +642,19 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, semantic->resource.register_index = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); components = *tokens++; - if ((components & 0xfff0) != (components & 0xf) * 0x1110) - FIXME("Components (%#x) have different data types.\n", components); - data_type = components & 0xf; - - if (!data_type || (data_type >= ARRAY_SIZE(data_type_table))) - { - FIXME("Unhandled data type %#x.\n", data_type); - semantic->resource_data_type = VKD3D_DATA_FLOAT; - } - else + for (i = 0; i < VKD3D_VEC4_SIZE; i++) { - semantic->resource_data_type = data_type_table[data_type]; + data_type = VKD3D_SM4_TYPE_COMPONENT(components, i); + + if (!data_type || (data_type >= ARRAY_SIZE(data_type_table))) + { + FIXME("Unhandled data type %#x.\n", data_type); + semantic->resource_data_type[i] = VKD3D_DATA_FLOAT; + } + else + { + semantic->resource_data_type[i] = data_type_table[data_type]; + } } if (reg_data_type == VKD3D_DATA_UAV) @@ -1791,16 +1795,21 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh case VKD3D_SM5_MODIFIER_DATA_TYPE: { DWORD components = (modifier & VKD3D_SM5_MODIFIER_DATA_TYPE_MASK) >> VKD3D_SM5_MODIFIER_DATA_TYPE_SHIFT; - enum vkd3d_sm4_data_type data_type = components & 0xf; + unsigned int i; - if ((components & 0xfff0) != (components & 0xf) * 0x1110) - FIXME("Components (%#x) have different data types.\n", components); - if (data_type < ARRAY_SIZE(data_type_table)) - ins->resource_data_type = data_type_table[data_type]; - else + for (i = 0; i < VKD3D_VEC4_SIZE; i++) { - FIXME("Unhandled data type %#x.\n", data_type); - ins->resource_data_type = VKD3D_DATA_FLOAT; + enum vkd3d_sm4_data_type data_type = VKD3D_SM4_TYPE_COMPONENT(components, i); + + if (!data_type || (data_type >= ARRAY_SIZE(data_type_table))) + { + FIXME("Unhandled data type %#x.\n", data_type); + ins->resource_data_type[i] = VKD3D_DATA_FLOAT; + } + else + { + ins->resource_data_type[i] = data_type_table[data_type]; + } } break; } @@ -1881,7 +1890,10 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; - ins->resource_data_type = VKD3D_DATA_FLOAT; + ins->resource_data_type[0] = VKD3D_DATA_FLOAT; + ins->resource_data_type[1] = VKD3D_DATA_FLOAT; + ins->resource_data_type[2] = VKD3D_DATA_FLOAT; + ins->resource_data_type[3] = VKD3D_DATA_FLOAT; memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 44fe35c..cb9c7a1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5625,7 +5625,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->resource, - semantic->resource_type, semantic->resource_data_type, 0, false); + semantic->resource_type, semantic->resource_data_type[0], 0, false); } static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6049ee1..9ff18e7 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -526,7 +526,7 @@ static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum v shader_addline(buffer, "unknown"); } -static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d_data_type type) +static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, const enum vkd3d_data_type *type) { static const char *const data_type_names[] = { @@ -545,13 +545,20 @@ static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d /* VKD3D_DATA_UNUSED */ "<unused>", }; const char *name; + int i; - if (type <= ARRAY_SIZE(data_type_names)) - name = data_type_names[type]; - else - name = "unknown"; + shader_addline(buffer, "("); + + for (i = 0; i < 4; i++) + { + if (type[i] < ARRAY_SIZE(data_type_names)) + name = data_type_names[type[i]]; + else + name = "unknown"; + shader_addline(buffer, "%s%s", i == 0 ? "" : ",", name); + } - shader_addline(buffer, "(%s,%s,%s,%s)", name, name, name, name); + shader_addline(buffer, ")"); } static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer, @@ -1539,7 +1546,10 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, ")"); } - if (ins->resource_data_type != VKD3D_DATA_FLOAT) + if (ins->resource_data_type[0] != VKD3D_DATA_FLOAT || + ins->resource_data_type[1] != VKD3D_DATA_FLOAT || + ins->resource_data_type[2] != VKD3D_DATA_FLOAT || + ins->resource_data_type[3] != VKD3D_DATA_FLOAT) shader_dump_data_type(buffer, ins->resource_data_type); for (i = 0; i < ins->dst_count; ++i) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a1bd3fc..c2fe2c8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -563,7 +563,16 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; enum vkd3d_shader_resource_data_type resource_data_type; - switch (semantic->resource_data_type) + if (semantic->resource_data_type[0] != semantic->resource_data_type[1] || + semantic->resource_data_type[0] != semantic->resource_data_type[2] || + semantic->resource_data_type[0] != semantic->resource_data_type[3]) + FIXME("Resource data types are different (%d, %d, %d, %d).\n", + semantic->resource_data_type[0], + semantic->resource_data_type[1], + semantic->resource_data_type[2], + semantic->resource_data_type[3]); + + switch (semantic->resource_data_type[0]) { case VKD3D_DATA_UNORM: resource_data_type = VKD3D_SHADER_RESOURCE_DATA_UNORM; @@ -581,7 +590,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; default: - ERR("Invalid resource data type %#x.\n", semantic->resource_data_type); + ERR("Invalid resource data type %#x.\n", semantic->resource_data_type[0]); resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 71eb80d..f88ea69 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -631,7 +631,7 @@ struct vkd3d_shader_semantic enum vkd3d_decl_usage usage; unsigned int usage_idx; enum vkd3d_shader_resource_type resource_type; - enum vkd3d_data_type resource_data_type; + enum vkd3d_data_type resource_data_type[VKD3D_VEC4_SIZE]; struct vkd3d_shader_resource resource; }; @@ -770,7 +770,7 @@ struct vkd3d_shader_instruction const struct vkd3d_shader_src_param *src; struct vkd3d_shader_texel_offset texel_offset; enum vkd3d_shader_resource_type resource_type; - enum vkd3d_data_type resource_data_type; + enum vkd3d_data_type resource_data_type[VKD3D_VEC4_SIZE]; bool coissue; const struct vkd3d_shader_src_param *predicate; union

1 0

Henri Verbeet : vkd3d-compiler: Enable colour output by default when outputting to a colour capable tty.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: 8d3e1e830083ddce420bf2a09775ad648ce6a7d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d3e1e830083ddce420bf2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 17:18:17 2020 +0330 vkd3d-compiler: Enable colour output by default when outputting to a colour capable tty. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 ++- configure.ac | 10 ++++++++-- programs/vkd3d-compiler/main.c | 43 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index fe6ba92..07426fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,7 +145,8 @@ EXTRA_DIST += \ bin_PROGRAMS = vkd3d-compiler vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c -vkd3d_compiler_LDADD = libvkd3d-shader.la +vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@ +vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@ LDADD = libvkd3d.la libvkd3d-utils.la AM_DEFAULT_SOURCE_EXT = .c diff --git a/configure.ac b/configure.ac index 6209386..2f22b05 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,10 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) -AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) +AC_ARG_WITH([ncurses], AS_HELP_STRING([--with-ncurses], [Build with the ncurses library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),, [enable_demos=no]) @@ -109,6 +110,10 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], ["$ac_cv_lib_soname_MoltenVK"])], [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) +AS_IF([test "x$with_ncurses" != "xno"], + [PKG_CHECK_MODULES([NCURSES], [ncurses], + [AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if you have ncurses.]) with_ncurses=yes], + [with_ncurses=no])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], @@ -152,8 +157,9 @@ AS_ECHO([" widl: ${WIDL} - Have XCB: ${HAVE_XCB} + Have ncurses: ${with_ncurses} Have SPIRV-Tools: ${with_spirv_tools} + Have xcb: ${HAVE_XCB} Building demos: ${enable_demos} Building tests: ${enable_tests} diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fdf3faf..8480c4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -17,9 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <fcntl.h> -#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> @@ -28,6 +29,9 @@ #include "vkd3d_common.h" #include "vkd3d_shader.h" +#ifdef HAVE_NCURSES +#include <term.h> +#endif #define MAX_COMPILE_OPTIONS 3 @@ -180,6 +184,8 @@ struct options bool print_version; bool print_source_types; bool print_target_types; + uint32_t formatting; + bool explicit_colour; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -230,7 +236,7 @@ static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer return false; } -static bool parse_formatting(uint32_t *formatting, char *arg) +static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) { static const struct formatting_option { @@ -270,6 +276,8 @@ static bool parse_formatting(uint32_t *formatting, char *arg) *formatting |= opts[i].value; else *formatting &= ~opts[i].value; + if (opts[i].value == VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR) + *colour = true; break; } } @@ -353,8 +361,6 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { - enum vkd3d_shader_compile_option_formatting_flags formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT - | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; int option; @@ -374,6 +380,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + options->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; for (;;) { @@ -405,7 +413,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) break; case OPTION_TEXT_FORMATTING: - if (!parse_formatting(&formatting, optarg)) + if (!parse_formatting(&options->formatting, &options->explicit_colour, optarg)) return false; break; @@ -450,7 +458,6 @@ static bool parse_command_line(int argc, char **argv, struct options *options) if (options->print_target_types) return true; - add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, formatting); if (optind < argc) options->filename = argv[argc - 1]; @@ -527,6 +534,26 @@ static FILE *open_output(const char *filename, bool *close) return f; } +static bool has_colour(FILE *f) +{ +#ifdef HAVE_NCURSES + bool supported; + int ret; + + if (!isatty(fileno(f))) + return false; + setupterm(NULL, fileno(f), &ret); + if (ret != 1) + return false; + supported = !!tigetstr("setaf"); + del_curterm(cur_term); + + return supported; +#else + return false; +#endif +} + int main(int argc, char **argv) { bool close_input = false, close_output = false; @@ -585,6 +612,10 @@ int main(int argc, char **argv) goto done; } + if (!options.explicit_colour && has_colour(output)) + options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type;

1 0

Zebediah Figura : vkd3d-shader: Use the same message context for scanning and compiling in vkd3d_shader_compile().
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: c78fe643a85cfd1cc95778ce5dd2603f3b599100 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c78fe643a85cfd1cc95778c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 25 16:52:58 2020 -0500 vkd3d-shader: Use the same message context for scanning and compiling in vkd3d_shader_compile(). So that messages from scanning are not lost. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 98 ++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c78fe643a85cfd1cc95…

1 0

Zebediah Figura : vkd3d-shader: Move vkd3d_shader_compile() to avoid forward declarations.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: vkd3d Branch: master Commit: 8dea03d9fd30a109415d65269e0981ab0e0c5f64 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8dea03d9fd30a109415d652… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 25 16:52:59 2020 -0500 vkd3d-shader: Move vkd3d_shader_compile() to avoid forward declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 181 +++++++++++++++++----------------- 1 file changed, 89 insertions(+), 92 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1ca04b7..46d9854 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -23,9 +23,6 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context); - static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) { buffer->buffer[0] = '\0'; @@ -302,95 +299,6 @@ void vkd3d_shader_free_messages(char *messages) vkd3d_free(messages); } -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, char **messages) -{ - struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; - struct vkd3d_shader_message_context message_context; - struct vkd3d_shader_instruction instruction; - struct vkd3d_shader_compile_info scan_info; - struct vkd3d_dxbc_compiler *spirv_compiler; - struct vkd3d_shader_parser parser; - int ret; - - TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); - - if (messages) - *messages = NULL; - - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) - return ret; - - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR; - - scan_info = *compile_info; - scan_descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; - scan_descriptor_info.next = scan_info.next; - scan_info.next = &scan_descriptor_info; - - if ((ret = scan_dxbc(&scan_info, &message_context)) < 0) - { - vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) - ret = VKD3D_ERROR_OUT_OF_MEMORY; - vkd3d_shader_message_context_cleanup(&message_context); - return ret; - } - - if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context)) < 0) - goto done; - - vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); - - if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) - { - ret = vkd3d_dxbc_binary_to_text(parser.data, out); - vkd3d_shader_parser_destroy(&parser); - goto done; - } - - if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context))) - { - ERR("Failed to create DXBC compiler.\n"); - vkd3d_shader_parser_destroy(&parser); - ret = VKD3D_ERROR; - goto done; - } - - message_context.line = 2; /* Line 1 is the version token. */ - message_context.column = 1; - while (!shader_sm4_is_end(parser.data, &parser.ptr)) - { - shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); - - if (instruction.handler_idx == VKD3DSIH_INVALID) - { - WARN("Encountered unrecognized or invalid instruction.\n"); - ret = VKD3D_ERROR_INVALID_SHADER; - break; - } - - if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) - break; - ++message_context.line; - } - - if (ret >= 0) - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); - - vkd3d_dxbc_compiler_destroy(spirv_compiler); - vkd3d_shader_parser_destroy(&parser); -done: - vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) - ret = VKD3D_ERROR_OUT_OF_MEMORY; - vkd3d_shader_message_context_cleanup(&message_context); - vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return ret; -} - struct vkd3d_shader_scan_context { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; @@ -931,6 +839,95 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char return ret; } +int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, char **messages) +{ + struct vkd3d_shader_scan_descriptor_info scan_descriptor_info; + struct vkd3d_shader_message_context message_context; + struct vkd3d_shader_instruction instruction; + struct vkd3d_shader_compile_info scan_info; + struct vkd3d_dxbc_compiler *spirv_compiler; + struct vkd3d_shader_parser parser; + int ret; + + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); + + if (messages) + *messages = NULL; + + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; + + if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) + return VKD3D_ERROR; + + scan_info = *compile_info; + scan_descriptor_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + scan_descriptor_info.next = scan_info.next; + scan_info.next = &scan_descriptor_info; + + if ((ret = scan_dxbc(&scan_info, &message_context)) < 0) + { + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); + return ret; + } + + if ((ret = vkd3d_shader_parser_init(&parser, &compile_info->source, &message_context)) < 0) + goto done; + + vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); + + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) + { + ret = vkd3d_dxbc_binary_to_text(parser.data, out); + vkd3d_shader_parser_destroy(&parser); + goto done; + } + + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, + &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context))) + { + ERR("Failed to create DXBC compiler.\n"); + vkd3d_shader_parser_destroy(&parser); + ret = VKD3D_ERROR; + goto done; + } + + message_context.line = 2; /* Line 1 is the version token. */ + message_context.column = 1; + while (!shader_sm4_is_end(parser.data, &parser.ptr)) + { + shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); + + if (instruction.handler_idx == VKD3DSIH_INVALID) + { + WARN("Encountered unrecognized or invalid instruction.\n"); + ret = VKD3D_ERROR_INVALID_SHADER; + break; + } + + if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) + break; + ++message_context.line; + } + + if (ret >= 0) + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); + + vkd3d_dxbc_compiler_destroy(spirv_compiler); + vkd3d_shader_parser_destroy(&parser); +done: + vkd3d_shader_message_context_trace_messages(&message_context); + if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + ret = VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_cleanup(&message_context); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return ret; +} + void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { TRACE("scan_descriptor_info %p.\n", scan_descriptor_info);

1 0