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

Re: [PATCH v2 0/7] MR191: wineandroid: PE conversion preparation - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/191

June 6, 2022

Re: [PATCH v3 0/6] MR173: preparation for sharing code in d3dx10/d3dx11 - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/173

June 6, 2022

Re: [PATCH v2 0/1] MR185: d2d1: Use d3d11 constants for constant buffer description. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/185

June 6, 2022

Re: [PATCH v3 0/4] MR183: kernelbase: Implement VirtualAlloc2FromApp(). - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/183

June 6, 2022

Re: [PATCH v2 0/1] MR186: secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity). - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/186

June 6, 2022

Re: [PATCH v2 0/1] MR188: wow64: Fix NtQueryDirectoryObject wrapper. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/188

June 6, 2022

Re: [PATCH v2 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity). - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

June 6, 2022

Re: [PATCH 7/8] mshtml: Check for valid XML Content-Type for responseXML in IE10+ modes.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116319 Your paranoid android. === w7u_el (32 bit report) === mshtml: script.c:644: Test failed: L"/index.html?es5.js:date_now: unexpected Date.now() result 1654524524751 expected 1654524524829"

June 6, 2022

[PATCH] wined3d: Parse the eval_centroid opcode.

by Zebediah Figura

This fixes rendering of trees and other objects in SnowRunner with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c45df8e6fa..dcdee479e17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5080,6 +5080,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c9822a95aa..40b5442ed04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11323,6 +11323,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c02f82b4d7b..c2e77021bb3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", + /* WINED3DSIH_EVAL_CENTROID */ "eval_centroid", /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 266b54d1d15..e60eb9b2fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -305,6 +305,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, WINED3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + WINED3D_SM5_OP_EVAL_CENTROID = 0xcd, WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1124,6 +1125,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, {WINED3D_SM5_OP_EVAL_SAMPLE_INDEX, WINED3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {WINED3D_SM5_OP_EVAL_CENTROID, WINED3DSIH_EVAL_CENTROID, "f", "f"}, {WINED3D_SM5_OP_DCL_GS_INSTANCES, WINED3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2c8c3804db..affef24d353 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -917,6 +917,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDREP, WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, + WINED3DSIH_EVAL_CENTROID, WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_EXP, WINED3DSIH_EXPP, -- 2.36.1

June 6, 2022

Re: [PATCH v2 0/5] MR131: wined3d: Introduce wined3d_device_check_format_support().

by Zebediah Figura

On 6/3/22 14:00, Chip Davis (@cdavis5e) wrote: > On Fri Jun 3 16:30:23 2022 +0000, Jan Sikorski wrote: >> For the record, I agree on the first point, to me it's unclear what the >> motivation is behind this move. > Mostly, it's because my change to implement logic op is on top of these changes, because `D3D11_FORMAT_SUPPORT2_OM_LOGIC_OP` is in the second format support group. > > This also felt cleaner, but I concede your point. But in order to do this from `d3d11`, we would need to make the format attribute and capability flags part of the API anyway. Do you have a better idea? > Probably the simplest thing to do in line with the current code is to add a new WINED3D_USAGE_QUERY_* flag. I don't know whether that's a direction we want to move in, though. Henri, do you have any thoughts on the matter?

June 6, 2022