- Wine-Commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/hlsl: Handle "unsigned int" type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: ea177a7750401c898699c5e3ab50f991195c550d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea177a7750401c898699c5e3ab50f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 18 23:29:58 2024 +0200 vkd3d-shader/hlsl: Handle "unsigned int" type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++ tests/hlsl/unsigned.shader_test | 66 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7936b988..619bcdf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,6 +234,7 @@ vkd3d_shader_tests = \ tests/hlsl/uav-rwstructuredbuffer.shader_test \ tests/hlsl/uav-rwtexture.shader_test \ tests/hlsl/unbounded-array-5.1.shader_test \ + tests/hlsl/unsigned.shader_test \ tests/hlsl/uniform-parameters.shader_test \ tests/hlsl/uniform-semantics.shader_test \ tests/hlsl/vector-indexing-uniform.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a5923d8b..91418775 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -49,7 +49,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *loc); RESERVED1 auto|catch|char|class|const_cast|delete|dynamic_cast|enum RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try -RESERVED4 typename|union|unsigned|using|virtual +RESERVED4 typename|union|using|virtual WS [ \t] NEWLINE (\n)|(\r\n) @@ -164,6 +164,7 @@ textureCUBE {return KW_TEXTURECUBE; } TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } +unsigned {return KW_UNSIGNED; } uniform {return KW_UNIFORM; } vector {return KW_VECTOR; } VertexShader {return KW_VERTEXSHADER; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9c1bdef9..0b742f12 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5566,6 +5566,7 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h %token KW_TEXTURECUBEARRAY %token KW_TRUE %token KW_TYPEDEF +%token KW_UNSIGNED %token KW_UNIFORM %token KW_VECTOR %token KW_VERTEXSHADER @@ -6713,6 +6714,26 @@ type_no_void: } vkd3d_free($1); } + | KW_UNSIGNED TYPE_IDENTIFIER + { + struct hlsl_type *type = hlsl_get_type(ctx->cur_scope, $2, true, true); + + if (hlsl_is_numeric_type(type) && type->e.numeric.type == HLSL_TYPE_INT) + { + if (!(type = hlsl_type_clone(ctx, type, 0, 0))) + YYABORT; + vkd3d_free((void *)type->name); + type->name = NULL; + type->e.numeric.type = HLSL_TYPE_UINT; + } + else + { + hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "The 'unsigned' keyword can't be used with type %s.", $2); + } + + $$ = type; + } | KW_STRUCT TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $2, true, true); diff --git a/tests/hlsl/unsigned.shader_test b/tests/hlsl/unsigned.shader_test new file mode 100644 index 00000000..8f7aa3dc --- /dev/null +++ b/tests/hlsl/unsigned.shader_test @@ -0,0 +1,66 @@ +[pixel shader] +unsigned int var1; +unsigned int2x2 var2; +unsigned int2 var3; +unsigned int var4[2]; + +typedef int Int; +typedef int2x2 Int2x2; +typedef int2 Int2; + +unsigned Int var5; +unsigned Int2x2 var6; +unsigned Int2 var7; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2 var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2x2 var; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader] +Texture2D<unsigned int> t; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model < 6.0 + +[pixel shader fail] +// crashes with dxc +typedef int Int[2]; +unsigned Int var; + +float4 main() : sv_target +{ + return 0; +}

1 0

Alistair Leslie-Hughes : include: Add LOGFONTA/W typedef in shtypes.idl.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 4aed0ef880e341fad73af6291d88ee4fe568e617 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aed0ef880e341fad73af6291d88ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 07:01:23 2024 +1000 include: Add LOGFONTA/W typedef in shtypes.idl. --- include/shtypes.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/include/shtypes.idl b/include/shtypes.idl index c83562a24bb..41b80789e0e 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -182,3 +182,50 @@ typedef [v1_enum] enum DEVICE_SCALE_FACTOR SCALE_450_PERCENT = 450, SCALE_500_PERCENT = 500 } DEVICE_SCALE_FACTOR; + +cpp_quote( "#ifndef LF_FACESIZE") +#define LF_FACESIZE 32 + +typedef struct tagLOGFONTA +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + CHAR lfFaceName[LF_FACESIZE]; +} LOGFONTA; + +typedef struct tagLOGFONTW +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + WCHAR lfFaceName[LF_FACESIZE]; +} LOGFONTW; + +#ifdef UNICODE + typedef LOGFONTW LOGFONT; +#else + typedef LOGFONTA LOGFONT; +#endif + +cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Correct IRowsetNotify HROW parameter type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: b6eada5e2f9e3c86c18df118cddd20e6212f64de URL: https://gitlab.winehq.org/wine/wine/-/commit/b6eada5e2f9e3c86c18df118cddd20… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 08:28:36 2024 +1000 include: Correct IRowsetNotify HROW parameter type. --- dlls/msdaps/usrmarshal.c | 4 ++-- include/rstnot.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 10b840b1991..48308c7ee71 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1180,14 +1180,14 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE return hr; } -HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); return IRowsetNotify_RemoteOnRowChange_Proxy(This, rowset, rows, hrows, reason, phase, cantdeny); } -HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); diff --git a/include/rstnot.idl b/include/rstnot.idl index 9e6975f9c78..048ac887b4f 100644 --- a/include/rstnot.idl +++ b/include/rstnot.idl @@ -49,7 +49,7 @@ interface IRowsetNotify : IUnknown [local] HRESULT OnRowChange([in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny); @@ -58,7 +58,7 @@ interface IRowsetNotify : IUnknown HRESULT RemoteOnRowChange( [in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny);

1 0

Elizabeth Figura : wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 8a1448d1d1b05d657de076496a3cf74113cfe735 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a1448d1d1b05d657de076496a3cf7… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 18:17:40 2024 -0500 wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields. --- dlls/wined3d/cs.c | 2 -- dlls/wined3d/stateblock.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 35 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a462f717bdf..958c23d76a7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2070,8 +2070,6 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->OriginalParms = op->light.OriginalParms; light_info->position = op->light.position; light_info->direction = op->light.direction; - light_info->exponent = op->light.exponent; - light_info->cutoff = op->light.cutoff; } void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ad5753e5d99..6c44733c8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2325,7 +2325,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont unsigned int light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; - float rho; if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; @@ -2348,7 +2347,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->position.y = light->position.y; object->position.z = light->position.z; object->position.w = 1.0f; - object->cutoff = 180.0f; /* FIXME: Range */ break; @@ -2358,8 +2356,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.y = -light->direction.y; object->direction.z = -light->direction.z; object->direction.w = 0.0f; - object->exponent = 0.0f; - object->cutoff = 180.0f; break; case WINED3D_LIGHT_SPOT: @@ -2375,33 +2371,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.z = light->direction.z; object->direction.w = 0.0f; - /* opengl-ish and d3d-ish spot lights use too different models - * for the light "intensity" as a function of the angle towards - * the main light direction, so we only can approximate very - * roughly. However, spot lights are rather rarely used in games - * (if ever used at all). Furthermore if still used, probably - * nobody pays attention to such details. */ - if (!light->falloff) - { - /* Falloff = 0 is easy, because d3d's and opengl's spot light - * equations have the falloff resp. exponent parameter as an - * exponent, so the spot light lighting will always be 1.0 for - * both of them, and we don't have to care for the rest of the - * rather complex calculation. */ - object->exponent = 0.0f; - } - else - { - rho = light->theta + (light->phi - light->theta) / (2 * light->falloff); - if (rho < 0.0001f) - rho = 0.0001f; - object->exponent = -0.3f / logf(cosf(rho / 2)); - } - - if (object->exponent > 128.0f) - object->exponent = 128.0f; - - object->cutoff = (float)(light->phi * 90 / M_PI); /* FIXME: Range */ break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aaa8dc6472f..3040e40d5e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,8 +2080,6 @@ struct wined3d_light_info /* Converted parms to speed up swapping lights */ struct wined3d_vec4 position; struct wined3d_vec4 direction; - float exponent; - float cutoff; struct rb_entry entry; struct list changed_entry;

1 0

Alistair Leslie-Hughes : include: Add IPreviewHandler* interfaces.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 447f817445807cd7b75cd3b69d5d1f0aee4c3868 URL: https://gitlab.winehq.org/wine/wine/-/commit/447f817445807cd7b75cd3b69d5d1f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 08:34:40 2024 +1000 include: Add IPreviewHandler* interfaces. --- include/shobjidl.idl | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 8aa24ea86fc..886cff89ef9 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3844,6 +3844,21 @@ interface IApplicationActivationManager : IUnknown [out] DWORD *processid); } +[ + object, + uuid(8895b1c6-b41f-4c1c-a562-0d564250836f), +] +interface IPreviewHandler : IUnknown +{ + HRESULT SetWindow([in] HWND hwnd, [in] const RECT *rect); + HRESULT SetRect([in] const RECT *rect); + HRESULT DoPreview(); + HRESULT Unload(); + HRESULT SetFocus(); + HRESULT QueryFocus([out] HWND *hwnd); + HRESULT TranslateAccelerator([in] MSG *msg); +} + [ object, uuid(fec87aaf-35f9-447a-adb7-20234491401a), @@ -3861,6 +3876,18 @@ interface IPreviewHandlerFrame : IUnknown HRESULT TranslateAccelerator([in] MSG *msg); } +[ + object, + uuid(196bf9a5-b346-4ef0-aa1e-5dcdb76768b1), + pointer_default(unique) +] +interface IPreviewHandlerVisuals : IUnknown +{ + HRESULT SetBackgroundColor([in] COLORREF color); + HRESULT SetFont([in] const LOGFONTW *logfont); + HRESULT SetTextColor([in] COLORREF color); +} + /***************************************************************************** * ShellObjects typelibrary */

1 0

Elizabeth Figura : wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings().
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: ac23ca135291958218d63266d9268ed671ffc676 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac23ca135291958218d63266d9268e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Apr 25 16:00:01 2024 -0500 wined3d: Remove the no longer used ignore_textype argument of wined3d_ffp_get_fs_settings(). --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 9 +++------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba61fe5a3cd..ea79e0361e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10408,7 +10408,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings, FALSE); + wined3d_ffp_get_fs_settings(&context_gl->c, state, &settings); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e4ff36425ab..a1c5a00d51f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6257,8 +6257,8 @@ void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *sr *dst = tmp; } -void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, - struct ffp_frag_settings *settings, BOOL ignore_textype) +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct ffp_frag_settings *settings) { #define ARG1 0x01 #define ARG2 0x02 @@ -6324,10 +6324,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; else settings->op[i].color_fixup = texture->resource.format->color_fixup; - if (ignore_textype) - settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; - else - settings->op[i].tex_type = texture->resource.gl_type; + settings->op[i].tex_type = texture->resource.gl_type; } else { settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3040e40d5e9..67ddf6f88cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2678,8 +2678,8 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb extern const struct wined3d_parent_ops wined3d_null_parent_ops; -void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const struct wined3d_state *state, - struct ffp_frag_settings *settings, BOOL ignore_textype); +void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct ffp_frag_settings *settings); const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings); void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc);

1 0

Elizabeth Figura : wined3d: Move the GL_EXTCALL() definition to wined3d_gl.h.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 7cc688371ff9b22ba0ed972836781fcf8c90cda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cc688371ff9b22ba0ed972836781f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:29:28 2024 -0500 wined3d: Move the GL_EXTCALL() definition to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 060d92318f8..561de235379 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -358,6 +358,8 @@ struct wined3d_gl_info void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); }; +#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) + void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext); void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program); void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea45e5ebdb3..8b8d9457a38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1553,8 +1553,6 @@ extern const struct wined3d_shader_backend_ops none_shader_backend; const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void); -#define GL_EXTCALL(f) (gl_info->gl_ops.ext.p_##f) - #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xff) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xff) #define D3DCOLOR_B_B(dw) (((dw) >> 0) & 0xff)

1 0

Alexandre Julliard : vkd3d: Import upstream release 1.12.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: fecd22d2aef0afb0436ed53b75f32cb9329af1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fecd22d2aef0afb0436ed53b75f32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:54:58 2024 +0200 vkd3d: Import upstream release 1.12. --- dlls/d3d10/tests/effect.c | 1 - dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +- libs/vkd3d/AUTHORS | 2 +- libs/vkd3d/Makefile.in | 1 + libs/vkd3d/config.h | 4 +- libs/vkd3d/include/private/vkd3d_common.h | 322 ++ libs/vkd3d/include/private/vkd3d_memory.h | 11 +- libs/vkd3d/include/vkd3d.h | 207 +- libs/vkd3d/include/vkd3d_shader.h | 76 +- libs/vkd3d/include/vkd3d_types.h | 8 + libs/vkd3d/libs/vkd3d-common/blob.c | 5 +- libs/vkd3d/libs/vkd3d-common/debug.c | 2 +- libs/vkd3d/libs/vkd3d-common/error.c | 7 +- libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 1190 ++++--- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 360 ++- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 49 +- libs/vkd3d/libs/vkd3d-shader/dxil.c | 2633 +++++++++++++-- libs/vkd3d/libs/vkd3d-shader/fx.c | 994 +++++- libs/vkd3d/libs/vkd3d-shader/glsl.c | 109 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 723 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 162 +- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 9 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 904 ++++-- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 863 +++-- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 317 +- libs/vkd3d/libs/vkd3d-shader/ir.c | 3362 ++++++++++++++++---- libs/vkd3d/libs/vkd3d-shader/preproc.l | 3 +- libs/vkd3d/libs/vkd3d-shader/spirv.c | 729 ++++- libs/vkd3d/libs/vkd3d-shader/tpf.c | 421 ++- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 340 +- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 192 +- libs/vkd3d/libs/vkd3d/cache.c | 254 ++ libs/vkd3d/libs/vkd3d/command.c | 41 +- libs/vkd3d/libs/vkd3d/device.c | 1060 ++++-- libs/vkd3d/libs/vkd3d/resource.c | 51 +- libs/vkd3d/libs/vkd3d/state.c | 42 +- libs/vkd3d/libs/vkd3d/utils.c | 34 + libs/vkd3d/libs/vkd3d/vkd3d_main.c | 22 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 268 +- 39 files changed, 12173 insertions(+), 3611 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used WINED3D_SHADER_CAP_SRGB_WRITE flag.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 9c895e2f047addefed78bc05c2d1693cfa0a33f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c895e2f047addefed78bc05c2d169… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:15:06 2024 -0500 wined3d: Remove the no longer used WINED3D_SHADER_CAP_SRGB_WRITE flag. --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/shader_spirv.c | 3 +-- dlls/wined3d/utils.c | 19 +++++-------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13ba1d65d13..ba61fe5a3cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11368,7 +11368,6 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before * shader_glsl_alloc(). */ - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; if (shader_glsl_full_ffp_varyings(gl_info)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 37fc1cb22d1..110fdfeff39 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1076,8 +1076,7 @@ static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct caps->ps_uniform_count = WINED3D_MAX_PS_CONSTS_F; caps->ps_1x_max_value = FLT_MAX; caps->varying_count = 0; - caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE - | WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; + caps->wined3d_caps = WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; } static BOOL shader_spirv_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef95c40135a..e4ff36425ab 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3059,7 +3059,7 @@ static void query_view_class(struct wined3d_format_gl *format) static void query_internal_format(struct wined3d_adapter *adapter, struct wined3d_format_gl *format, const struct wined3d_format_texture_info *texture_info, - struct wined3d_gl_info *gl_info, BOOL srgb_write_supported, BOOL srgb_format) + struct wined3d_gl_info *gl_info, BOOL srgb_format) { GLint count, multisample_types[8]; unsigned int i, max_log2; @@ -3078,12 +3078,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, { query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_READ, WINED3D_FORMAT_CAP_SRGB_READ, "sRGB read"); - - if (srgb_write_supported) - query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, - WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write"); - else - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); + query_format_cap(gl_info, format, format->srgb_internal, GL_SRGB_WRITE, + WINED3D_FORMAT_CAP_SRGB_WRITE, "sRGB write"); if (!(format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE))) @@ -3115,9 +3111,6 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->internal = format->srgb_internal; } } - - if ((format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SRGB_WRITE) && !srgb_write_supported) - format_clear_caps(&format->f, WINED3D_FORMAT_CAP_SRGB_WRITE); } if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) @@ -3170,11 +3163,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win struct fragment_caps fragment_caps; struct shader_caps shader_caps; unsigned int i, j; - BOOL srgb_write; adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - srgb_write = (!shader_caps.ps_version || (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE)); for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { @@ -3229,7 +3220,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if (!gl_info->supported[ARB_SHADOW] && (format->f.caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_SHADOW)) format_clear_caps(&format->f, WINED3D_FORMAT_CAP_TEXTURE); - query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); + query_internal_format(adapter, format, &format_texture_info[i], gl_info, FALSE); /* Texture conversion stuff */ format->f.conv_byte_count = format_texture_info[i].conv_byte_count; @@ -3257,7 +3248,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format->internal = format_texture_info[i].gl_srgb_internal; srgb_format->srgb_internal = format_texture_info[i].gl_srgb_internal; format_set_caps(&srgb_format->f, WINED3D_FORMAT_CAP_SRGB_READ | WINED3D_FORMAT_CAP_SRGB_WRITE); - query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, srgb_write, TRUE); + query_internal_format(adapter, srgb_format, &format_texture_info[i], gl_info, TRUE); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d1bab87b00..ea45e5ebdb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1401,7 +1401,6 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u #define WINED3D_SHADER_CAP_FULL_FFP_VARYINGS 0x00000010u

1 0

Elizabeth Figura : wined3d: Remove some no longer used wined3d_context fields.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: abc44d4620b85eeafdae8da0b17d8cae0403695f URL: https://gitlab.winehq.org/wine/wine/-/commit/abc44d4620b85eeafdae8da0b17d8c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 17:17:42 2024 -0500 wined3d: Remove some no longer used wined3d_context fields. --- dlls/wined3d/wined3d_private.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b8d9457a38..aaa8dc6472f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1906,17 +1906,16 @@ struct wined3d_context DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; + DWORD update_primitive_type : 1; + DWORD update_patch_vertex_count : 1; DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ - DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; - DWORD last_was_ckey : 1; DWORD last_was_dual_source_blend : 1; - DWORD texShaderBumpMap : 8; /* WINED3D_MAX_FFP_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_FFP_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_FFP_TEXTURES, 8 */ @@ -1927,10 +1926,8 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD update_primitive_type : 1; - DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 14; + DWORD padding : 24; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ @@ -1940,7 +1937,6 @@ struct wined3d_context void *shader_backend_data; - void *fragment_pipe_data; struct wined3d_stream_info stream_info;

1 0