January 2016 - Wine-Commits

Stefan Dösinger : d3d11/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 616e965789b10e615442e0a557c6cc30bafbc694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616e965789b10e615442e0a55… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:31 2016 +0000 d3d11/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3fdc897..d295f19 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4425,6 +4425,96 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_multisample_init(void) +{ + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *backbuffer, *multi; + ID3D11Device *device; + ID3D11DeviceContext *context; + ULONG refcount; + DWORD color; + HRESULT hr; + unsigned int x, y; + struct texture_readback rb; + BOOL all_zero = TRUE; + UINT count = 0; + HWND window; + IDXGISwapChain *swapchain; + ID3D11RenderTargetView *rtview; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); + todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); + if (!count) + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); + goto done; + } + + window = CreateWindowA("static", "d3d11_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)backbuffer, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_ClearRenderTargetView(context, rtview, white); + + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 2; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &multi); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)backbuffer, 0, + (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + + get_texture_readback(backbuffer, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_texture_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + ID3D11DeviceContext_Release(context); + ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D11Texture2D_Release(multi); + DestroyWindow(window); +done: + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -4454,4 +4544,5 @@ START_TEST(d3d11) test_fragment_coords(); test_update_subresource(); test_resource_map(); + test_multisample_init(); }

1 0

Stefan Dösinger : d3d10core/tests: Multisampled render targets are zeroed on creation.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: f37472ae21cc14bea97d6116faaa20387ae1d9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37472ae21cc14bea97d6116f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:30 2016 +0000 d3d10core/tests: Multisampled render targets are zeroed on creation. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd7707..464acd0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -4637,6 +4637,92 @@ static void test_update_subresource(void) DestroyWindow(window); } +static void test_multisample_init(void) +{ + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *backbuffer, *multi; + ID3D10Device *device; + ULONG refcount; + DWORD color; + HRESULT hr; + unsigned int x, y; + struct texture_readback rb; + BOOL all_zero = TRUE; + UINT count = 0; + HWND window; + IDXGISwapChain *swapchain; + ID3D10RenderTargetView *rtview; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); + todo_wine ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); + if (!count) + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); + goto done; + } + + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + ID3D10Device_ClearRenderTargetView(device, rtview, white); + + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 2; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)backbuffer, 0, + (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + + get_texture_readback(backbuffer, &rb); + for (y = 0; y < 480; ++y) + { + for (x = 0; x < 640; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, 0x00000000, 0)) + { + all_zero = FALSE; + break; + } + } + if (!all_zero) + break; + } + release_texture_readback(&rb); + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + + ID3D10RenderTargetView_Release(rtview); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + ID3D10Texture2D_Release(multi); + DestroyWindow(window); +done: + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -4664,4 +4750,5 @@ START_TEST(device) test_il_append_aligned(); test_fragment_coords(); test_update_subresource(); + test_multisample_init(); }

1 0

Andrew Eikum : xaudio2_8: Use shared source.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 5f15d5b37cbc4ac95b01393337eafe1e88e4d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15d5b37cbc4ac95b0139333… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 11 13:52:11 2016 -0600 xaudio2_8: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/xaudio2_7/Makefile.in | 2 + dlls/xaudio2_7/x3daudio.c | 55 +++++++++++++ dlls/xaudio2_7/xapofx.c | 83 +++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 16 +--- dlls/xaudio2_7/xaudio_dll.c | 42 ++++++++-- dlls/xaudio2_8/Makefile.in | 10 ++- dlls/xaudio2_8/xaudio_dll.c | 163 -------------------------------------- include/xapofx.h | 4 - 10 files changed, 191 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f15d5b37cbc4ac95b013…

1 0

Józef Kucia : wined3d: Recognize SM4 ineg opcode.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 17bd3ee7b4079f13cab1432ad1cbcdfd7e7afe60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bd3ee7b4079f13cab1432ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:24 2016 +0100 wined3d: Recognize SM4 ineg opcode. 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 ac7964e..074b74f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5264,6 +5264,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, + /* WINED3DSIH_INEG */ NULL, /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f11acc4..27c079b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7912,6 +7912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ NULL, + /* WINED3DSIH_INEG */ NULL, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3ddaa0f..d747816 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -92,6 +92,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", + /* WINED3DSIH_INEG */ "ineg", /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4636c5f..6e02352 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -105,6 +105,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_INE = 0x27, + WINED3D_SM4_OP_INEG = 0x28, WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, @@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, {WINED3D_SM4_OP_INE, WINED3DSIH_INE, "U", "II"}, + {WINED3D_SM4_OP_INEG, WINED3DSIH_INEG, "I", "I"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "IR"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22dd551..07007c0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -507,6 +507,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMIN, WINED3DSIH_IMUL, WINED3DSIH_INE, + WINED3DSIH_INEG, WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL,

1 0

Józef Kucia : wined3d: Recognize SM4 ftou opcode.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 5b5efd552ee77d6cea64b0fef6447aa0ffe151bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5efd552ee77d6cea64b0fef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:20 2016 +0100 wined3d: Recognize SM4 ftou opcode. 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 59780f8..6b67c7d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5251,6 +5251,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_FTOI */ NULL, + /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66a541a..a18e7a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7899,6 +7899,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, + /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6aa5bd5..d63a377 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -79,6 +79,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_FRC */ "frc", /* WINED3DSIH_FTOI */ "ftoi", + /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d0d6291..c1f20b0 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -93,6 +93,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, WINED3D_SM4_OP_FTOI = 0x1b, + WINED3D_SM4_OP_FTOU = 0x1c, WINED3D_SM4_OP_GE = 0x1d, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, @@ -264,6 +265,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, "F", "F"}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, "F", "F"}, {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, "I", "F"}, + {WINED3D_SM4_OP_FTOU, WINED3DSIH_FTOU, "U", "F"}, {WINED3D_SM4_OP_GE, WINED3DSIH_GE, "U", "FF"}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, "I", "II"}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 805e32e..86f4123 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -494,6 +494,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_EXPP, WINED3DSIH_FRC, WINED3DSIH_FTOI, + WINED3DSIH_FTOU, WINED3DSIH_GE, WINED3DSIH_IADD, WINED3DSIH_IEQ,

1 0

Gerald Pfeifer : wined3d: Fix incorrect indentation of several break statements in in set_tex_op.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: f5a8580589661e92d57ea76e5cb6f162fe47366c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a8580589661e92d57ea76e5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 10 19:22:46 2016 +0800 wined3d: Fix incorrect indentation of several break statements in in set_tex_op. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 47afa42..1d80fa0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2767,7 +2767,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2789,7 +2789,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_ALPHA_ADD_COLOR: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2817,7 +2817,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_COLOR_ADD_ALPHA: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2845,7 +2845,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_INVALPHA_ADD_COLOR: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2873,7 +2873,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MODULATE_INVCOLOR_ADD_ALPHA: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2907,7 +2907,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_MULTIPLY_ADD: if (gl_info->supported[ATI_TEXTURE_ENV_COMBINE3]) { @@ -2929,7 +2929,7 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined checkGLcall("GL_TEXTURE_ENV, scal_target, 1"); } else Handled = FALSE; - break; + break; case WINED3D_TOP_BUMPENVMAP_LUMINANCE: case WINED3D_TOP_BUMPENVMAP: if (gl_info->supported[NV_TEXTURE_SHADER2])

1 0

Stefan Dösinger : d3d10core/tests: Viewport properties are integers.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: c447e691b92aede799e2ac2d5dfdbaff5cc2ec72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c447e691b92aede799e2ac2d5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 10 11:21:32 2016 +0000 d3d10core/tests: Viewport properties are integers. Shuts up an MSVC warning. Note that in d3d11 those members are FLOATs. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 464acd0..539ded8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3584,10 +3584,10 @@ static void test_texture(void) ID3D10Device_VSSetShader(device, vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); - vp.TopLeftX = 0.0f; - vp.TopLeftY = 0.0f; - vp.Width = 640.0f; - vp.Height = 480.0f; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D10Device_RSSetViewports(device, 1, &vp);

1 0

Józef Kucia : wined3d: Recognize SM4 imad opcode.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: c0055712383dd83003ce65ef6f5925a98af4be70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0055712383dd83003ce65ef6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 11 11:53:22 2016 +0100 wined3d: Recognize SM4 imad opcode. 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 e54fc24..5aa5669 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5259,6 +5259,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_ILT */ NULL, + /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa02ed8..218585c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7907,6 +7907,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_ILT */ NULL, + /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d3482fc..ef6b141 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -87,6 +87,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_ILT */ "ilt", + /* WINED3DSIH_IMAD */ "imad", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index acc1b4b..91db7da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -100,6 +100,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_ILT = 0x22, + WINED3D_SM4_OP_IMAD = 0x23, WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, @@ -273,6 +274,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, + {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "II"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d603898..8274a98 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -502,6 +502,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_ILT, + WINED3DSIH_IMAD, WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL,

1 0

Julian Rüger : German translation for release 1.9.1
by Jeremy Newman Jan. 11, 2016

Jan. 11, 2016

Module: website Branch: master Commit: 238a0a8b6751c7a5fc05c27876f37ac82ec5414f URL: http://source.winehq.org/git/website.git/?a=commit;h=238a0a8b6751c7a5fc05c2… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 12:37:01 2016 +0100 German translation for release 1.9.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016010901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016010901.xml b/news/de/2016010901.xml new file mode 100644 index 0000000..74395c0 --- /dev/null +++ b/news/de/2016010901.xml @@ -0,0 +1,16 @@ +<news> +<date>9. Januar 2016</date> +<title>Wine 1.9.1 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Einige zusätzliche, aufgeschobene Korrekturen.</li> + <li>Unterstützung von Debugregistern auf x86-64.</li> + <li>Weitere Shader-Model-4-Befehle.</li> + <li>Unterstützung der Mingw-ARM-toolchain.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.1
by Jeremy Newman Jan. 11, 2016

Jan. 11, 2016

Module: website Branch: master Commit: 25b014c7541d3b4616af947dcd388bb2e4c68eeb URL: http://source.winehq.org/git/website.git/?a=commit;h=25b014c7541d3b4616af94… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jan 10 09:08:12 2016 +0100 Polish translation for release 1.9.1 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016010901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016010901.xml b/news/pl/2016010901.xml new file mode 100644 index 0000000..f51c448 --- /dev/null +++ b/news/pl/2016010901.xml @@ -0,0 +1,16 @@ +<news> +<date>Styczeń 9, 2016</date> +<title>Wydano Wine 1.9.1</title> +<body> + Wydanie rozwojowe Wine 1.9.1 jest już dostępne. + <a href="{$root}/announce/1.9.1">Co nowego</a> w tym wydaniu: +<ul> + <li>Więcej odroczonych poprawek.</li> + <li>Wsparcie dla rejestrów diagnostycznych na x86-64.</li> + <li>Więcej instrukcji Modelu Cieniowania 4.</li> + <li>Obsługa łańcucha narzędzi Mingw ARM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0