April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Print FIXME() for unknown SM4+ register types.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: ab3aaee6fd9adae79f5d80552fca46f12333c7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3aaee6fd9adae79f5d80552… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:28 2016 +0200 wined3d: Print FIXME() for unknown SM4+ register types. 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/shader_sm4.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 487c4a9..ae17a1f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -731,33 +731,33 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ 0, + /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, - /* UNKNOWN */ 0, + /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, - /* UNKNOWN */ 0, + /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_FORK_INSTANCE_ID */ WINED3DSPR_FORKINSTID, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; @@ -967,7 +967,8 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; - if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table) + || register_type_table[register_type] == ~0u) { FIXME("Unhandled register type %#x.\n", register_type); param->type = WINED3DSPR_TEMP;

1 0

Alexandre Julliard : makefiles: Generate installation rules for static and import libraries.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: e0d89a495429a65ef9a277bba9299c89464b999c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d89a495429a65ef9a277bba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 14:06:10 2016 +0900 makefiles: Generate installation rules for static and import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index c0cfed0..334740e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2836,6 +2836,8 @@ static struct strarray output_sources( const struct makefile *make ) output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames_obj_dir( make, object_files ); output( "\n\t$(RANLIB) $@\n" ); + add_install_rule( make, install_rules, make->staticlib, make->staticlib, + strmake( "d$(dlldir)/%s", make->staticlib )); if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3461,7 +3463,12 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || !strcmp( make->imports.str[i], "ucrtbase" ); - if (make->module && !make->install_lib.count) strarray_add( &make->install_lib, make->module ); + if (make->module && !make->install_lib.count && !make->install_dev.count) + { + if (make->importlib) strarray_add( &make->install_dev, make->importlib ); + if (make->staticlib) strarray_add( &make->install_dev, make->staticlib ); + else strarray_add( &make->install_lib, make->module ); + } make->include_paths = empty_strarray; make->define_args = empty_strarray;

1 0

Alexandre Julliard : makefiles: Support installing scripts from the tools directory.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 2f956a4e06fd36366fd97aba9ddb4b3b99620cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f956a4e06fd36366fd97aba9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 13:59:54 2016 +0900 makefiles: Support installing scripts from the tools directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 47efda3..c0cfed0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2140,52 +2140,66 @@ static struct strarray output_install_rules( const struct makefile *make, struct if (!files.count) return uninstall; for (i = 0; i < files.count; i += 2) - if (strchr( "dps", files.str[i + 1][0] )) /* only for files copied from object dir */ - strarray_add_uniq( &targets, files.str[i] ); + { + const char *file = files.str[i]; + switch (*files.str[i + 1]) + { + case 'd': /* data file */ + case 'p': /* program file */ + case 's': /* script */ + strarray_add_uniq( &targets, obj_dir_path( make, file )); + break; + case 't': /* script in tools dir */ + strarray_add_uniq( &targets, tools_dir_path( make, file )); + break; + } + } output( "install %s::", target ); - output_filenames_obj_dir( make, targets ); + output_filenames( targets ); output( "\n" ); install_sh = top_src_dir_path( make, "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; - const char *dest = files.str[i + 1]; + const char *dest = strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 ); - switch (*dest) + switch (*files.str[i + 1]) { case 'd': /* data file */ - output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 'D': /* data file in source dir */ - output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s $(DESTDIR)%s\n", - install_sh, src_dir_path( make, file ), dest + 1 ); + output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", + install_sh, src_dir_path( make, file ), dest ); break; case 'p': /* program file */ - output( "\tSTRIPPROG=\"$(STRIP)\" %s $(INSTALL_PROGRAM_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\tSTRIPPROG=\"$(STRIP)\" %s $(INSTALL_PROGRAM_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 's': /* script */ - output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", - install_sh, obj_dir_path( make, file ), dest + 1 ); + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, obj_dir_path( make, file ), dest ); break; case 'S': /* script in source dir */ - output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", - install_sh, src_dir_path( make, file ), dest + 1 ); + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, src_dir_path( make, file ), dest ); + break; + case 't': /* script in tools dir */ + output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s %s\n", + install_sh, tools_dir_path( make, file ), dest ); break; case 'y': /* symlink */ - output( "\trm -f $(DESTDIR)%s && %s %s $(DESTDIR)%s\n", dest + 1, ln_s, file, dest + 1 ); + output( "\trm -f %s && %s %s %s\n", dest, ln_s, file, dest ); break; default: assert(0); } + strarray_add( &uninstall, dest ); } - for (i = 0; i < files.count; i += 2) - strarray_add( &uninstall, strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 )); - strarray_add_uniq( phony_targets, "install" ); strarray_add_uniq( phony_targets, target ); return uninstall; @@ -2808,8 +2822,8 @@ static struct strarray output_sources( const struct makefile *make ) else if (*dll_ext) { char *binary = replace_extension( make->module, ".exe", "" ); - add_install_rule( make, install_rules, binary, tools_dir_path( make, "wineapploader" ), - strmake( "s$(bindir)/%s", binary )); + add_install_rule( make, install_rules, binary, "wineapploader", + strmake( "t$(bindir)/%s", binary )); } }

1 0

Stefan Dösinger : wined3d: Remove the dead wined3d_volume_invalidate_location declaration.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 7f9798de91be4b50c558d83fb51cacb66bdbb2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9798de91be4b50c558d83fb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 1 20:45:40 2016 +0100 wined3d: Remove the dead wined3d_volume_invalidate_location declaration. 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/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 180add8..8f6d09f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2568,7 +2568,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_cleanup(struct wined3d_volume *volume) DECLSPEC_HIDDEN; HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; -void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume,

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_is_full_rect().
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 29421729ef520ab79d03198ef98a55aa40ed4606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29421729ef520ab79d03198ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:57 2016 +0200 wined3d: Use the texture dimension helpers in surface_is_full_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 922c43a..a7dfbf5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -487,9 +487,13 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { - if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) + unsigned int t; + + t = wined3d_texture_get_level_width(surface->container, surface->texture_level); + if ((r->left && r->right) || abs(r->right - r->left) != t) return FALSE; - if ((r->top && r->bottom) || abs(r->bottom - r->top) != surface->resource.height) + t = wined3d_texture_get_level_height(surface->container, surface->texture_level); + if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) return FALSE; return TRUE; }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture ().
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 3f5e1d1707c922e1ff24f2a452faf171f8fd5a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5e1d1707c922e1ff24f2a45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:53 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 35bf521..4001e6c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4282,6 +4282,7 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_texture *cursor_image, unsigned int sub_resource_idx) { + unsigned int texture_level = sub_resource_idx % cursor_image->level_count; struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; struct wined3d_map_desc map_desc; @@ -4304,8 +4305,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.multisample_quality = 0; desc.usage = WINED3DUSAGE_DYNAMIC; desc.pool = WINED3D_POOL_DEFAULT; - desc.width = cursor_image->sub_resources[sub_resource_idx].resource->width; - desc.height = cursor_image->sub_resources[sub_resource_idx].resource->height; + desc.width = wined3d_texture_get_level_width(cursor_image, texture_level); + desc.height = wined3d_texture_get_level_height(cursor_image, texture_level); desc.depth = 1; desc.size = 0;

1 0

Qian Hong : loader: Fix wld_prctl prototype.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 33765285c535ea521961a6ee812db08c79abda6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33765285c535ea521961a6ee8… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Apr 4 01:42:06 2016 +0800 loader: Fix wld_prctl prototype. Spotted by Robert O'Callahan. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 25aaacd..db0e998 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -423,7 +423,7 @@ SYSCALL_FUNC( wld_mmap, 9 /* SYS_mmap */ ); int wld_mprotect( const void *addr, size_t len, int prot ); SYSCALL_FUNC( wld_mprotect, 10 /* SYS_mprotect */ ); -int wld_prctl( int code, int arg ); +int wld_prctl( int code, long arg ); SYSCALL_FUNC( wld_prctl, 157 /* SYS_prctl */ ); uid_t wld_getuid(void);

1 0

Alistair Leslie-Hughes : wined3d: Add detection for NVIDIA GTX TITAN.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: 20478d9182e15bcbac5a19ff82ef89b423f7dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20478d9182e15bcbac5a19ff8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 2 19:50:33 2016 +1100 wined3d: Add detection for NVIDIA GTX TITAN. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a299d3..02fb587 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1284,6 +1284,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1749,6 +1750,7 @@ cards_nvidia_binary[] = {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ada7fa5..26ef25b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1780,6 +1780,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Jarkko Korpi : wined3d: Add detection for NVIDIA GeForce 425M.
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: ea4f91c7eacd5615898075f8629c9b7f7775ebc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4f91c7eacd5615898075f86… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Sat Apr 2 19:50:32 2016 +1100 wined3d: Add detection for NVIDIA GeForce 425M. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d193897..0a299d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1245,6 +1245,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT425M, "NVIDIA GeForce GT 425M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1786,6 +1787,7 @@ cards_nvidia_binary[] = {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ + {"GT 425M", CARD_NVIDIA_GEFORCE_GT425M}, /* Geforce 400 - lowend mobile */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f6d09f..ada7fa5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1741,6 +1741,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, + CARD_NVIDIA_GEFORCE_GT425M = 0x0df0, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0, CARD_NVIDIA_GEFORCE_GTS450 = 0x0dc4,

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_create_dib_section().
by Alexandre Julliard April 4, 2016

April 4, 2016

Module: wine Branch: master Commit: d496fbc1e495067a606c8746dd35831ba65e2cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d496fbc1e495067a606c8746d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 15:30:56 2016 +0200 wined3d: Use the texture dimension helpers in surface_create_dib_section(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a84564..922c43a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -390,7 +390,7 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) b_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); b_info->bmiHeader.biWidth = row_pitch / format->byte_count; - b_info->bmiHeader.biHeight = 0 - surface->resource.height; + b_info->bmiHeader.biHeight = 0 - wined3d_texture_get_level_height(texture, surface->texture_level); b_info->bmiHeader.biSizeImage = slice_pitch; b_info->bmiHeader.biPlanes = 1; b_info->bmiHeader.biBitCount = format->byte_count * 8;

1 0