June 2016 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Remove an unnecessary call to -[ NSView removeFromSuperview].
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 9fbc364ea103239553701aa9a9932e3fdabcfff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbc364ea103239553701aa9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 3 00:06:50 2016 -0500 winemac: Remove an unnecessary call to -[NSView removeFromSuperview]. It's only obliquely documented, but -[NSView addSubview:positioned:relativeTo:] will remove the view from its old superview if it's changing superviews. If it's just changing z-order within its current superview, it won't. This avoids some flicker of OpenGL surfaces being removed and re-added. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0b975f2..d3b3c89 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3354,7 +3354,6 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma WineWindow* oldWindow = (WineWindow*)[view window]; WineWindow* newWindow = (WineWindow*)[superview window]; - [view removeFromSuperview]; if (prev) [superview addSubview:view positioned:NSWindowBelow relativeTo:prev]; else

1 0

Piotr Caban : msvcr110: Fix critical_section_scoped_lock structure size.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: c996b8a02f03da99c94c51ff9287242ae52fe49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c996b8a02f03da99c94c51ff9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 14:27:29 2016 +0200 msvcr110: Fix critical_section_scoped_lock structure size. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index e69e1b9..d83425c 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -514,7 +514,8 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( typedef struct { critical_section *cs; - void *unknown[3]; + void *unknown[4]; + int unknown2[2]; } critical_section_scoped_lock; /* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */

1 0

YongHao Hu : msvcr120/tests: Add critical section test.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 7456d5e433363718b97189cdb076d9848533246d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7456d5e433363718b97189cdb… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Jun 3 14:36:39 2016 +0200 msvcr120/tests: Add critical section test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 251 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7456d5e433363718b9718…

1 0

Józef Kucia : d3d11/tests: Add test for NULL sampler.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 4c26025321dff8e22346a848f8554fa685259640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c26025321dff8e22346a848f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:00 2016 +0200 d3d11/tests: Add test for NULL sampler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 74feaa2..7191563 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7446,6 +7446,89 @@ static void test_input_assembler(void) release_test_context(&test_context); } +static void test_null_sampler(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11SamplerState *sampler; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, float2(position.x / 640.0f, position.y / 480.0f)); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, blue); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + sampler = NULL; + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + ID3D11ShaderResourceView_Release(srv); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -7490,4 +7573,5 @@ START_TEST(d3d11) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_input_assembler(); + test_null_sampler(); }

1 0

Józef Kucia : d3d10core/tests: Add test for NULL sampler.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 442fb186e1aeed750fe64fa61c7ba909bb575072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442fb186e1aeed750fe64fa61… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:01 2016 +0200 d3d10core/tests: Add test for NULL sampler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 79ee5c4..599c1a5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -7268,6 +7268,87 @@ static void test_input_assembler(void) release_test_context(&test_context); } +static void test_null_sampler(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10ShaderResourceView *srv; + ID3D10RenderTargetView *rtv; + ID3D10SamplerState *sampler; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, float2(position.x / 640.0f, position.y / 480.0f)); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, rtv, blue); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + sampler = NULL; + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + ID3D10ShaderResourceView_Release(srv); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -7309,4 +7390,5 @@ START_TEST(device) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_input_assembler(); + test_null_sampler(); }

1 0

Józef Kucia : wined3d: Implement SM4 umax instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 25dfbbafb34deea222c9652e5b56db5eecd2e479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dfbbafb34deea222c9652e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:02 2016 +0200 wined3d: Implement SM4 umax instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6096555..7b395e9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5370,6 +5370,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_ULT */ NULL, + /* WINED3DSIH_UMAX */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a60244b..517435d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3465,6 +3465,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ROUND_PI: instruction = "ceil"; break; case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; + case WINED3DSIH_UMAX: instruction = "max"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; @@ -8682,6 +8683,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop, + /* WINED3DSIH_UMAX */ shader_glsl_map2gl, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6dffe33..8c41afb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -202,6 +202,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_ULT */ "ult", + /* WINED3DSIH_UMAX */ "umax", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e9aa22a..62b5d65 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -176,6 +176,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_ULT = 0x4f, WINED3D_SM4_OP_UGE = 0x50, + WINED3D_SM4_OP_UMAX = 0x53, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -688,6 +689,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "uu", "uu"}, {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"}, + {WINED3D_SM4_OP_UMAX, WINED3DSIH_UMAX, "u", "uu"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "f", "u"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "u", "uu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 879ea0b..473a4b8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -709,6 +709,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_UDIV, WINED3DSIH_UGE, WINED3DSIH_ULT, + WINED3DSIH_UMAX, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Józef Kucia : wined3d: Implement SM4 switch instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: ba60b0f59a8a2e7e3e444f7032d51a437b096bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba60b0f59a8a2e7e3e444f703… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:03 2016 +0200 wined3d: Implement SM4 switch instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b395e9..53b8f2c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5345,6 +5345,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, + /* WINED3DSIH_SWITCH */ NULL, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, /* WINED3DSIH_TEXBEML */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 517435d..69ff2bc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4228,6 +4228,14 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) ++loop_state->current_depth; } +static void shader_glsl_switch(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src0_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_addline(ins->ctx->buffer, "switch (%s)\n{\n", src0_param.param_str); +} + static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; @@ -8658,6 +8666,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, + /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8c41afb..be12432 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -177,6 +177,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SQRT */ "sqrt", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", + /* WINED3DSIH_SWITCH */ "switch", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", /* WINED3DSIH_TEXBEML */ "texbeml", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 62b5d65..ab39bf8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -172,6 +172,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SAMPLE_B = 0x4a, WINED3D_SM4_OP_SQRT = 0x4b, + WINED3D_SM4_OP_SWITCH = 0x4c, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_ULT = 0x4f, @@ -685,6 +686,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE_GRAD, WINED3DSIH_SAMPLE_GRAD, "u", "fRSff"}, {WINED3D_SM4_OP_SAMPLE_B, WINED3DSIH_SAMPLE_B, "u", "fRSf"}, {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "f", "f"}, + {WINED3D_SM4_OP_SWITCH, WINED3DSIH_SWITCH, "", "u"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "ff", "f"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "uu", "uu"}, {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 473a4b8..255dbd5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -684,6 +684,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SQRT, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, + WINED3DSIH_SWITCH, WINED3DSIH_TEX, WINED3DSIH_TEXBEM, WINED3DSIH_TEXBEML,

1 0

Józef Kucia : wined3d: Implement SM4 case instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 7929895029e994595535df705cb28335fa46732e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7929895029e994595535df705… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:04 2016 +0200 wined3d: Implement SM4 case instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 9 +++++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 53b8f2c..7ecf193 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5217,6 +5217,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAKP */ NULL, /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, + /* WINED3DSIH_CASE */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69ff2bc..cfd0cfd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4236,6 +4236,14 @@ static void shader_glsl_switch(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "switch (%s)\n{\n", src0_param.param_str); } +static void shader_glsl_case(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src0_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_addline(ins->ctx->buffer, "case %s:\n", src0_param.param_str); +} + static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; @@ -8538,6 +8546,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, + /* WINED3DSIH_CASE */ shader_glsl_case, /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index be12432..bf67dbe 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -49,6 +49,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_BREAKP */ "breakp", /* WINED3DSIH_CALL */ "call", /* WINED3DSIH_CALLNZ */ "callnz", + /* WINED3DSIH_CASE */ "case", /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CRS */ "crs", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ab39bf8..247f9b0 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -111,6 +111,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_AND = 0x01, WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, + WINED3D_SM4_OP_CASE = 0x06, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, @@ -623,6 +624,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, "", ""}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, + {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 255dbd5..e9d5a58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_BREAKP, WINED3DSIH_CALL, WINED3DSIH_CALLNZ, + WINED3DSIH_CASE, WINED3DSIH_CMP, WINED3DSIH_CND, WINED3DSIH_CRS,

1 0

Józef Kucia : wined3d: Implement SM4 default instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 9aa587af9e2a3d64a1a37f97ace20ca4f878f2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa587af9e2a3d64a1a37f97a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:05 2016 +0200 wined3d: Implement SM4 default instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7ecf193..c85c917 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5249,6 +5249,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, + /* WINED3DSIH_DEFAULT */ NULL, /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cfd0cfd..97f7fa8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4244,6 +4244,11 @@ static void shader_glsl_case(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "case %s:\n", src0_param.param_str); } +static void shader_glsl_default(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "default:\n"); +} + static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; @@ -8578,6 +8583,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, + /* WINED3DSIH_DEFAULT */ shader_glsl_default, /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bf67dbe..27242ae 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", + /* WINED3DSIH_DEFAULT */ "default", /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 247f9b0..809f39c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -113,6 +113,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CASE = 0x06, WINED3D_SM4_OP_CUT = 0x09, + WINED3D_SM4_OP_DEFAULT = 0x0a, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, @@ -626,6 +627,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, + {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9d5a58..50548a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -588,6 +588,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, + WINED3DSIH_DEFAULT, WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV,

1 0

Józef Kucia : wined3d: Implement SM4 endswitch instruction.
by Alexandre Julliard 03 Jun '16

03 Jun '16

Module: wine Branch: master Commit: 7cc36e71b2c04fafc175d6fa1eb65a8c404fb279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc36e71b2c04fafc175d6fa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 3 11:33:06 2016 +0200 wined3d: Implement SM4 endswitch instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 c85c917..2c510b7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5269,6 +5269,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, + /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ 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 97f7fa8..92849db 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8603,6 +8603,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, + /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 27242ae..bd8d55d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -101,6 +101,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDREP */ "endrep", + /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 809f39c..ef5fcd2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -125,6 +125,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDLOOP = 0x16, + WINED3D_SM4_OP_ENDSWITCH = 0x17, WINED3D_SM4_OP_EQ = 0x18, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, @@ -639,6 +640,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, "", ""}, {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, "", ""}, + {WINED3D_SM4_OP_ENDSWITCH, WINED3DSIH_ENDSWITCH, "", ""}, {WINED3D_SM4_OP_EQ, WINED3DSIH_EQ, "u", "ff"}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, "f", "f"}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50548a1..f9a8ffa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -608,6 +608,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDIF, WINED3DSIH_ENDLOOP, WINED3DSIH_ENDREP, + WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, WINED3DSIH_EXP, WINED3DSIH_EXPP,

1 0