July 2019 - Wine-commits - list.winehq.org

Tag wine-4.12.1 : Alexandre Julliard : Release 4.12.1
by Alexandre Julliard 07 Jul '19

07 Jul '19

Module: wine Branch: refs/tags/wine-4.12.1 Tag: bbca1d9e4f4635c258ec9bbcd66fbd799cdaa434 URL: https://source.winehq.org/git/wine.git/?a=tag;h=bbca1d9e4f4635c258ec9bbcd66… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:25:09 2019 +0200 Release 4.12.1

1 0

Alexandre Julliard : include: Make sure the JUMP_BUFFER structure is correctly aligned on x86-64
by Alexandre Julliard 06 Jul '19

06 Jul '19

Module: wine Branch: master Commit: 83f04e3850532c3963090f7467a4e96713eee7ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f04e3850532c3963090f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 6 20:05:53 2019 +0200 include: Make sure the JUMP_BUFFER structure is correctly aligned on x86-64 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 2a4af49..26dc4a7 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -47,12 +47,12 @@ typedef struct __JUMP_BUFFER #elif defined(__x86_64__) -typedef struct _SETJMP_FLOAT128 +typedef DECLSPEC_ALIGN(16) struct _SETJMP_FLOAT128 { - unsigned __int64 DECLSPEC_ALIGN(16) Part[2]; + unsigned __int64 Part[2]; } SETJMP_FLOAT128; -typedef struct _JUMP_BUFFER +typedef DECLSPEC_ALIGN(16) struct _JUMP_BUFFER { unsigned __int64 Frame; unsigned __int64 Rbx;

1 0

Alexandre Julliard : gdi32: Make GDI driver functions cdecl.
by Alexandre Julliard 06 Jul '19

06 Jul '19

Module: wine Branch: master Commit: 4a902de213d3f4137948f5b9938b7fb001b78de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a902de213d3f4137948f5b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 6 20:45:50 2019 +0200 gdi32: Make GDI driver functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 18 +-- dlls/gdi32/clipping.c | 8 +- dlls/gdi32/dc.c | 4 +- dlls/gdi32/dib.c | 12 +- dlls/gdi32/dibdrv/bitblt.c | 26 ++-- dlls/gdi32/dibdrv/dc.c | 110 +++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 96 ++++++------- dlls/gdi32/dibdrv/graphics.c | 58 ++++---- dlls/gdi32/dibdrv/objects.c | 8 +- dlls/gdi32/dibdrv/opengl.c | 4 +- dlls/gdi32/driver.c | 186 ++++++++++++------------- dlls/gdi32/enhmfdrv/bitblt.c | 18 +-- dlls/gdi32/enhmfdrv/dc.c | 136 +++++++++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 188 ++++++++++++------------- dlls/gdi32/enhmfdrv/graphics.c | 72 +++++----- dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/enhmfdrv/objects.c | 18 +-- dlls/gdi32/font.c | 6 +- dlls/gdi32/freetype.c | 46 +++---- dlls/gdi32/gdi_private.h | 114 +++++++-------- dlls/gdi32/mapping.c | 22 +-- dlls/gdi32/mfdrv/bitblt.c | 20 +-- dlls/gdi32/mfdrv/dc.c | 74 +++++----- dlls/gdi32/mfdrv/graphics.c | 48 +++---- dlls/gdi32/mfdrv/init.c | 18 +-- dlls/gdi32/mfdrv/metafiledrv.h | 160 ++++++++++----------- dlls/gdi32/mfdrv/objects.c | 14 +- dlls/gdi32/mfdrv/text.c | 4 +- dlls/gdi32/painting.c | 20 +-- dlls/gdi32/palette.c | 6 +- dlls/gdi32/path.c | 82 +++++------ dlls/wineandroid.drv/init.c | 10 +- dlls/winemac.drv/display.c | 4 +- dlls/winemac.drv/gdi.c | 10 +- dlls/winemac.drv/macdrv.h | 8 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winemac.drv/vulkan.c | 2 +- dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 6 +- dlls/wineps.drv/brush.c | 4 +- dlls/wineps.drv/builtin.c | 8 +- dlls/wineps.drv/color.c | 4 +- dlls/wineps.drv/driver.c | 10 +- dlls/wineps.drv/escape.c | 12 +- dlls/wineps.drv/font.c | 2 +- dlls/wineps.drv/graphics.c | 40 +++--- dlls/wineps.drv/init.c | 12 +- dlls/wineps.drv/pen.c | 4 +- dlls/wineps.drv/psdrv.h | 94 ++++++------- dlls/wineps.drv/text.c | 4 +- dlls/winex11.drv/bitblt.c | 16 +-- dlls/winex11.drv/brush.c | 4 +- dlls/winex11.drv/graphics.c | 50 +++---- dlls/winex11.drv/init.c | 22 +-- dlls/winex11.drv/palette.c | 10 +- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/x11drv.h | 88 ++++++------ dlls/winex11.drv/xrender.c | 46 +++---- dlls/winex11.drv/xvidmode.c | 4 +- include/wine/gdi_driver.h | 260 +++++++++++++++++------------------ 60 files changed, 1171 insertions(+), 1171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a902de213d3f4137948…

1 0

Henri Verbeet : wined3d: Handle context acquisition failure in wined3d_device_create_primary_opengl_context_cs ().
by Alexandre Julliard 06 Jul '19

06 Jul '19

Module: wine Branch: master Commit: 40a83b2ff3bca9ef58d03400a3c8e4aac94a0dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a83b2ff3bca9ef58d03400… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jul 6 19:26:49 2019 +0430 wined3d: Handle context acquisition failure in wined3d_device_create_primary_opengl_context_cs(). Now that we no longer always call context_acquire() from swapchain_init(), context acquisition can fail here instead. This fixes a regression introduced by commit 64d41b3dec0635c56268be64d407ed9bfd8c0695. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47468 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a064..2c76851 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1108,10 +1108,19 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) struct wined3d_texture *target; HRESULT hr; + swapchain = device->swapchains[0]; + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; + if (!(context = context_acquire(device, target, 0))) + { + WARN("Failed to acquire context.\n"); + return; + } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, device->adapter->vertex_pipe, device->adapter->fragment_pipe))) { ERR("Failed to allocate shader private data, hr %#x.\n", hr); + context_release(context); return; } @@ -1119,6 +1128,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) { ERR("Failed to create CPU blitter.\n"); device->shader_backend->shader_free_private(device, NULL); + context_release(context); return; } wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); @@ -1127,9 +1137,6 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); - swapchain = device->swapchains[0]; - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - context = context_acquire(device, target, 0); context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); create_default_samplers(device, context);

1 0

Alexandre Julliard : wineboot: Fix do_cpuid() calling convention.
by Alexandre Julliard 06 Jul '19

06 Jul '19

Module: wine Branch: master Commit: e245df2a0c8d1270a4cc0129407072c917a0c325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e245df2a0c8d1270a4cc0129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 6 12:56:13 2019 +0200 wineboot: Fix do_cpuid() calling convention. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47464 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 834bf92..55f2c6c 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,13 +185,13 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value ) return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, (lstrlenW(value) + 1) * sizeof(WCHAR) ); } -extern void do_cpuid( unsigned int ax, unsigned int *p ); #if defined(_MSC_VER) -void do_cpuid( unsigned int ax, unsigned int *p ) +static void do_cpuid( unsigned int ax, unsigned int *p ) { __cpuid( p, ax ); } #elif defined(__i386__) +extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); __ASM_GLOBAL_FUNC( do_cpuid, "pushl %esi\n\t" "pushl %ebx\n\t" @@ -206,18 +206,22 @@ __ASM_GLOBAL_FUNC( do_cpuid, "popl %esi\n\t" "ret" ) #elif defined(__x86_64__) +extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); __ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rsi\n\t" "pushq %rbx\n\t" - "movl %edi,%eax\n\t" + "movq %rcx,%rax\n\t" + "movq %rdx,%rsi\n\t" "cpuid\n\t" "movl %eax,(%rsi)\n\t" "movl %ebx,4(%rsi)\n\t" "movl %ecx,8(%rsi)\n\t" "movl %edx,12(%rsi)\n\t" "popq %rbx\n\t" + "popq %rsi\n\t" "ret" ) #else -void do_cpuid( unsigned int ax, unsigned int *p ) +static void do_cpuid( unsigned int ax, unsigned int *p ) { FIXME("\n"); }

1 0

Alexandre Julliard : kernel32: Set the path environment variables according to the WoW64 environment.
by Alexandre Julliard 06 Jul '19

06 Jul '19

Module: wine Branch: master Commit: 862cc117c1d6dfcd313f7318fa60974cdb1bfe40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862cc117c1d6dfcd313f7318… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 6 17:05:47 2019 +0200 kernel32: Set the path environment variables according to the WoW64 environment. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47467 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 52 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2dcd53b..23e2316 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -714,31 +714,12 @@ static void set_additional_environment(void) static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; - static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; - static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - static const WCHAR wineconfigdirW[] = {'W','I','N','E','C','O','N','F','I','G','D','I','R',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - const char *path; WCHAR *profile_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; WCHAR buf[32]; HANDLE hkey; - DWORD len, i; - - /* wine paths */ - set_wine_path_variable( winedatadirW, wine_get_data_dir() ); - set_wine_path_variable( winehomedirW, getenv("HOME") ); - set_wine_path_variable( winebuilddirW, wine_get_build_dir() ); - set_wine_path_variable( wineconfigdirW, wine_get_config_dir() ); - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) - { - sprintfW( buf, winedlldirW, i ); - set_wine_path_variable( buf, path ); - } - sprintfW( buf, winedlldirW, i ); - set_wine_path_variable( buf, NULL ); + DWORD len; /* ComputerName */ len = ARRAY_SIZE( buf ); @@ -802,28 +783,49 @@ static void set_wow64_environment(void) static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; + static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; + static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR wineconfigdirW[] = {'W','I','N','E','C','O','N','F','I','G','D','I','R',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - WCHAR arch[64]; + const char *path; + WCHAR buf[64]; WCHAR *value; HANDLE hkey; + DWORD i; + + /* set the Wine paths */ + + set_wine_path_variable( winedatadirW, wine_get_data_dir() ); + set_wine_path_variable( winehomedirW, getenv("HOME") ); + set_wine_path_variable( winebuilddirW, wine_get_build_dir() ); + set_wine_path_variable( wineconfigdirW, wine_get_config_dir() ); + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + { + sprintfW( buf, winedlldirW, i ); + set_wine_path_variable( buf, path ); + } + sprintfW( buf, winedlldirW, i ); + set_wine_path_variable( buf, NULL ); /* set the PROCESSOR_ARCHITECTURE variable */ - if (GetEnvironmentVariableW( arch6432W, arch, ARRAY_SIZE( arch ))) + if (GetEnvironmentVariableW( arch6432W, buf, ARRAY_SIZE( buf ))) { if (is_win64) { - SetEnvironmentVariableW( archW, arch ); + SetEnvironmentVariableW( archW, buf ); SetEnvironmentVariableW( arch6432W, NULL ); } } - else if (GetEnvironmentVariableW( archW, arch, ARRAY_SIZE( arch ))) + else if (GetEnvironmentVariableW( archW, buf, ARRAY_SIZE( buf ))) { if (is_wow64) { - SetEnvironmentVariableW( arch6432W, arch ); + SetEnvironmentVariableW( arch6432W, buf ); SetEnvironmentVariableW( archW, x86W ); } }

1 0

Alexandre Julliard : Wine release 4.12
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: website Branch: master Commit: f5f3ba104f47afed672694cfa1ef3d87c11d6bbb URL: https://source.winehq.org/git/website.git/?a=commit;h=f5f3ba104f47afed67269… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 21:49:32 2019 +0200 Wine release 4.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019070501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019070501.xml b/news/en/2019070501.xml new file mode 100644 index 0000000..6153722 --- /dev/null +++ b/news/en/2019070501.xml @@ -0,0 +1,16 @@ +<news> +<date>July 5, 2019</date> +<title>Wine 4.12 Released</title> +<body> + The Wine development release 4.12 is now available. + <a href="{$root}/announce/4.12">What's new</a> in this release: +<ul> + <li>Still more DLLs are built as PE files by default.</li> + <li>Support for Plug & Play device drivers.</li> + <li>Better support for the Visual Studio remote debugger.</li> + <li>More support for enumerating display devices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Paul Gofman : wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 34eeb0a877e7a5bb3be77e0ea0d9cd4e08862f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34eeb0a877e7a5bb3be77e0e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:41 2019 +0300 wined3d: Fixup 3D sampler when sampling 2D texture for PS models 2 and 3. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/shader.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ab2d0bb..d786f68 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25946,7 +25946,7 @@ static void test_mismatched_sample_types(void) { {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, - {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5, TRUE}, + {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5}, {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, TRUE, 0x00202020}, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 93d33a6..d856fea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4003,6 +4003,39 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } } } + else if (shader->reg_maps.shader_version.major <= 3) + { + for (i = 0; i < shader->limits->sampler; ++i) + { + enum wined3d_shader_resource_type resource_type; + enum wined3d_shader_tex_types tex_type; + + if (!(resource_type = shader->reg_maps.resource_info[i].type)) + continue; + + switch (resource_type) + { + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + tex_type = WINED3D_SHADER_TEX_3D; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + tex_type = WINED3D_SHADER_TEX_CUBE; + break; + default: + tex_type = WINED3D_SHADER_TEX_2D; + break; + } + + if ((texture = state->textures[i])) + { + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D + && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) + tex_type = WINED3D_SHADER_TEX_2D; + } + args->tex_types |= tex_type <reg_maps.shader_version.major >= 4) { @@ -4201,7 +4234,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d } enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) + unsigned int resource_idx, DWORD tex_types) { static enum wined3d_shader_resource_type shader_resource_type_from_shader_tex_types[] = { @@ -4212,7 +4245,7 @@ enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct win unsigned int idx; - if (reg_maps->shader_version.major != 1) + if (reg_maps->shader_version.major > 3) return reg_maps->resource_info[resource_idx].type; if (!reg_maps->resource_info[resource_idx].type) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cda311..b959a28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1365,6 +1365,7 @@ enum wined3d_shader_tex_types WINED3D_SHADER_TEX_2D = 0, WINED3D_SHADER_TEX_3D = 1, WINED3D_SHADER_TEX_CUBE = 2, + WINED3D_SHADER_TEX_ERR = 3, }; struct ps_compile_args @@ -1372,8 +1373,8 @@ struct ps_compile_args struct color_fixup_desc color_fixup[WINED3D_MAX_FRAGMENT_SAMPLERS]; enum wined3d_vertex_processing_mode vp_mode; enum wined3d_ffp_ps_fog_mode fog; + DWORD tex_types; /* ps 1 - 3, 16 textures */ WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). D3D9 has a limit of 16 samplers and the fixup is superfluous @@ -1381,6 +1382,7 @@ struct ps_compile_args WORD np2_fixup; WORD shadow; /* WINED3D_MAX_FRAGMENT_SAMPLERS, 16 */ WORD texcoords_initialized; /* WINED3D_MAX_TEXTURES, 8 */ + WORD padding_to_dword; DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; @@ -4445,7 +4447,7 @@ struct wined3d_shader }; enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps, - unsigned int resource_idx, WORD tex_types) DECLSPEC_HIDDEN; + unsigned int resource_idx, DWORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Paul Gofman : wined3d: Fixup 2D sampler when sampling 3D texture for PS models 2 and 3.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: a9eca729bc2b043c98e495909f36fd7338649550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9eca729bc2b043c98e49590… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jul 3 17:56:42 2019 +0300 wined3d: Fixup 2D sampler when sampling 3D texture for PS models 2 and 3. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 ++--- dlls/wined3d/shader.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d786f68..f2c6ee4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25939,7 +25939,6 @@ static void test_mismatched_sample_types(void) IDirect3DPixelShader9 **pixel_shader; D3DCOLOR expected_colour; D3DCOLOR expected_broken; - BOOL todo; D3DCOLOR expected_broken2; } tests[] = @@ -25947,7 +25946,7 @@ static void test_mismatched_sample_types(void) {"2d_2d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_2d, 0x00707070}, {"3d_3d", (IDirect3DBaseTexture9 **)&volume, &ps_3d, 0x00303030}, {"2d_3d", (IDirect3DBaseTexture9 **)&tex_2d, &ps_3d, 0x00707070, 0x00b2cce5}, - {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, TRUE, 0x00202020}, + {"3d_2d", (IDirect3DBaseTexture9 **)&volume, &ps_2d, 0x00303030, 0x00b2cce5, 0x00202020}, }; window = create_window(); @@ -26044,7 +26043,7 @@ static void test_mismatched_sample_types(void) colour = getPixelColor(device, 320, 240); - todo_wine_if(tests[i].todo) ok(color_match(colour, tests[i].expected_colour, 1) + ok(color_match(colour, tests[i].expected_colour, 1) || broken(tests[i].expected_broken && color_match(colour, tests[i].expected_broken, 1)) || broken(tests[i].expected_broken2 && color_match(colour, tests[i].expected_broken2, 1)), "test %s, expected 0x%08x, got 0x%08x.\n", diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d856fea..c233059 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4032,6 +4032,9 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_3D && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) tex_type = WINED3D_SHADER_TEX_2D; + else if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D + && resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D) + tex_type = WINED3D_SHADER_TEX_3D; } args->tex_types |= tex_type << i * WINED3D_PSARGS_TEXTYPE_SHIFT; }

1 0

Alexandre Julliard : Release 4.12.
by Alexandre Julliard 05 Jul '19

05 Jul '19

Module: wine Branch: master Commit: 8c34add3bd747d8ff267974de67880b7eb50bc8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c34add3bd747d8ff267974d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 21:47:47 2019 +0200 Release 4.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 860 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 422 insertions(+), 459 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c34add3bd747d8ff267…

1 0