wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Henri Verbeet : wined3d: Store the NPOT texture capabilities in struct wined3d_d3d_info.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 07dad9b1509f1f13022c4a36880253f1d581f411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07dad9b1509f1f13022c4a36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:20 2018 +0430 wined3d: Store the NPOT texture capabilities in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 ++++++-- dlls/wined3d/directx.c | 20 ++++++++------------ dlls/wined3d/resource.c | 3 ++- dlls/wined3d/texture.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 14 ++++++++------ 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f3862cd..e60383c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3664,7 +3664,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->shader_double_precision = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION; + d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; @@ -3676,10 +3676,14 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; - d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; + d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); d3d_info->wined3d_creation_flags = wined3d_creation_flags; d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); + d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; + d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); d3d_info->valid_rt_mask = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 919c3e7..81c3b5d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2018,31 +2018,27 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPTEXTURECAPS_PROJECTED | WINED3DPTEXTURECAPS_PERSPECTIVE; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + if (!d3d_info->texture_npot) { caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; - if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]) + if (d3d_info->texture_npot_conditional) caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; } if (gl_info->supported[EXT_TEXTURE3D]) { - caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | - WINED3DPTEXTURECAPS_MIPVOLUMEMAP; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { + caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP + | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; + if (!d3d_info->texture_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; - } } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | - WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP + | WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!d3d_info->texture_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; - } } caps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a3dadec..6cb1ac4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -60,6 +60,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -129,7 +130,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * continue; } if (((width & (width - 1)) || (height & (height - 1))) - && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] + && !d3d_info->texture_npot && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] && gl_type == WINED3D_GL_RES_TYPE_TEX_2D) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f499d4..b878e38 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1535,6 +1535,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT UINT multisample_quality, void *mem, UINT pitch) { struct wined3d_texture_sub_resource *sub_resource; + const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; struct wined3d_device *device; @@ -1548,6 +1549,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT device = texture->resource.device; gl_info = &device->adapter->gl_info; + d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.usage); resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); @@ -1622,8 +1624,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT else texture->target = GL_TEXTURE_2D; - if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] - && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot + && !d3d_info->texture_npot_conditional) { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; texture->pow2_width = texture->pow2_height = 1; @@ -2571,6 +2573,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_texture_ops *texture_ops) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_device_parent *device_parent = device->device_parent; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int sub_count, i, j, size, offset = 0; @@ -2637,7 +2640,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) - && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + && !d3d_info->texture_npot) { /* level_count == 0 returns an error as well. */ if (level_count != 1 || layer_count != 1 || desc->resource_type == WINED3D_RTYPE_TEXTURE_3D) @@ -2653,8 +2656,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } texture->flags |= WINED3D_TEXTURE_COND_NP2; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !gl_info->supported[ARB_TEXTURE_RECTANGLE] - && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !d3d_info->texture_npot_conditional) { /* TODO: Add support for non-power-of-two compressed textures. */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 850d66e..239873b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -187,14 +187,16 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - BOOL xyzrhw; - BOOL emulated_flatshading; - BOOL ffp_generic_attributes; - BOOL vs_clipping; - BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; - BOOL shader_double_precision; + unsigned int xyzrhw : 1; + unsigned int emulated_flatshading : 1; + unsigned int ffp_generic_attributes : 1; + unsigned int vs_clipping : 1; + unsigned int shader_color_key : 1; + unsigned int shader_double_precision : 1; + unsigned int texture_npot : 1; + unsigned int texture_npot_conditional : 1; enum wined3d_feature_level feature_level; };

1 0

Henri Verbeet : wined3d: Reorder the formats in debug_d3dformat() to match the enum order.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 2e34d2e4578cf49ad6332221611a76639d45e7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e34d2e4578cf49ad6332221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:19 2018 +0430 wined3d: Reorder the formats in debug_d3dformat() to match the enum order. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ffce6c..9d0a64b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4141,18 +4141,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R10G10B10X2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10X2_SNORM); FMT_TO_STR(WINED3DFMT_R10G10B10_SNORM_A2_UNORM); - FMT_TO_STR(WINED3DFMT_UYVY); - FMT_TO_STR(WINED3DFMT_YUY2); - FMT_TO_STR(WINED3DFMT_YV12); - FMT_TO_STR(WINED3DFMT_NV12); - FMT_TO_STR(WINED3DFMT_DXT1); - FMT_TO_STR(WINED3DFMT_DXT2); - FMT_TO_STR(WINED3DFMT_DXT3); - FMT_TO_STR(WINED3DFMT_DXT4); - FMT_TO_STR(WINED3DFMT_DXT5); - FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8); - FMT_TO_STR(WINED3DFMT_G8R8_G8B8); - FMT_TO_STR(WINED3DFMT_R8G8_B8G8); FMT_TO_STR(WINED3DFMT_D16_LOCKABLE); FMT_TO_STR(WINED3DFMT_D32_UNORM); FMT_TO_STR(WINED3DFMT_S1_UINT_D15_UNORM); @@ -4161,12 +4149,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); - FMT_TO_STR(WINED3DFMT_ATI1N); - FMT_TO_STR(WINED3DFMT_ATI2N); - FMT_TO_STR(WINED3DFMT_INST); - FMT_TO_STR(WINED3DFMT_NVDB); - FMT_TO_STR(WINED3DFMT_NVHU); - FMT_TO_STR(WINED3DFMT_NVHS); FMT_TO_STR(WINED3DFMT_R32G32B32A32_TYPELESS); FMT_TO_STR(WINED3DFMT_R32G32B32A32_FLOAT); FMT_TO_STR(WINED3DFMT_R32G32B32A32_UINT); @@ -4267,11 +4249,29 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); FMT_TO_STR(WINED3DFMT_BC7_UNORM); FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_UYVY); + FMT_TO_STR(WINED3DFMT_YUY2); + FMT_TO_STR(WINED3DFMT_YV12); + FMT_TO_STR(WINED3DFMT_DXT1); + FMT_TO_STR(WINED3DFMT_DXT2); + FMT_TO_STR(WINED3DFMT_DXT3); + FMT_TO_STR(WINED3DFMT_DXT4); + FMT_TO_STR(WINED3DFMT_DXT5); + FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8); + FMT_TO_STR(WINED3DFMT_G8R8_G8B8); + FMT_TO_STR(WINED3DFMT_R8G8_B8G8); + FMT_TO_STR(WINED3DFMT_ATI1N); + FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_INST); + FMT_TO_STR(WINED3DFMT_NVDB); + FMT_TO_STR(WINED3DFMT_NVHU); + FMT_TO_STR(WINED3DFMT_NVHS); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); + FMT_TO_STR(WINED3DFMT_NV12); #undef FMT_TO_STR default: {

1 0

Henri Verbeet : wined3d: Properly initialise the driver info in wined3d_adapter_no3d_init().
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 14cda07a9f4f79c7260e87d6837f620800456b16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14cda07a9f4f79c7260e87d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:18 2018 +0430 wined3d: Properly initialise the driver info in wined3d_adapter_no3d_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 15 ++++----------- dlls/wined3d/directx.c | 25 +++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6f39a3e..f3862cd 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1015,13 +1015,6 @@ static const struct wined3d_gpu_description *query_gpu_description(const struct TRACE("Overriding device PCI ID with 0x%04x.\n", device); } - if (wined3d_settings.emulated_textureram) - { - *vram_bytes = wined3d_settings.emulated_textureram; - TRACE("Overriding amount of video memory with 0x%s bytes.\n", - wine_dbgstr_longlong(*vram_bytes)); - } - if (!(gpu_description = wined3d_get_gpu_description(vendor, device)) && (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE || wined3d_settings.pci_device_id != PCI_DEVICE_NONE) && !once++) @@ -3816,6 +3809,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); + adapter->vram_bytes = driver_info->vram_bytes; + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) @@ -4286,10 +4283,6 @@ BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_ return FALSE; } - adapter->vram_bytes = adapter->driver_info.vram_bytes; - adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3600506..919c3e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -189,6 +189,9 @@ static const struct driver_version_information driver_version_table[] = /* VMware */ {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, + + /* Wine */ + {DRIVER_WINE, DRIVER_MODEL_GENERIC, "wined3d.dll", 0, 0, 0}, }; /* The amount of video memory stored in the gpu description table is the minimum amount of video memory @@ -563,6 +566,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = vram_bytes ? vram_bytes : (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; + if (wined3d_settings.emulated_textureram) + { + driver_info->vram_bytes = wined3d_settings.emulated_textureram; + TRACE("Overriding amount of video memory with 0x%s bytes.\n", + wine_dbgstr_longlong(driver_info->vram_bytes)); + } + /** * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. * In order to avoid this application bug we limit the amount of video memory @@ -2473,14 +2483,17 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { + static const struct wined3d_gpu_description gpu_description = + { + HW_VENDOR_SOFTWARE, CARD_WINE, "WineD3D DirectDraw Emulation", DRIVER_WINE, 128, + }; + TRACE("adapter %p.\n", adapter); - adapter->driver_info.name = "Display"; - adapter->driver_info.description = "WineD3D DirectDraw Emulation"; - if (wined3d_settings.emulated_textureram) - adapter->vram_bytes = wined3d_settings.emulated_textureram; - else - adapter->vram_bytes = 128 * 1024 * 1024; + wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0); + adapter->vram_bytes = adapter->driver_info.vram_bytes; + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); if (!wined3d_adapter_init_format_info(adapter, NULL)) return FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69eda3e..850d66e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2607,6 +2607,7 @@ enum wined3d_display_driver DRIVER_NVIDIA_GEFORCE6, DRIVER_NVIDIA_GEFORCE8, DRIVER_VMWARE, + DRIVER_WINE, DRIVER_UNKNOWN, };

1 0

Henri Verbeet : wined3d: Get rid of the "format_count" field from struct wined3d_adapter.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: d76c027ef773f0ae10971b79f988836743e6c351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76c027ef773f0ae10971b79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 18 03:19:17 2018 +0430 wined3d: Get rid of the "format_count" field from struct wined3d_adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 - dlls/wined3d/utils.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab6a452..3600506 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2513,7 +2513,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->luid.HighPart, adapter->luid.LowPart, adapter); adapter->formats = NULL; - adapter->format_count = 0; if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index db27270..9ffce6c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1993,8 +1993,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) struct wined3d_format *format; unsigned int i, j; - adapter->format_count = WINED3D_FORMAT_COUNT; - if (!(adapter->formats = heap_calloc(adapter->format_count + if (!(adapter->formats = heap_calloc(WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*adapter->formats)))) { ERR("Failed to allocate memory.\n"); @@ -2728,7 +2727,7 @@ static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { BOOL fallback_fmt_used = FALSE, regular_fmt_used = FALSE; struct wined3d_format *format = &adapter->formats[i]; @@ -2842,7 +2841,7 @@ static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); } - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3621,7 +3620,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format_set_flag(format, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3756,7 +3755,7 @@ static void init_format_gen_mipmap_info(const struct wined3d_adapter *adapter, if (!gl_info->fbo_ops.glGenerateMipmap) return; - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; @@ -3913,7 +3912,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; unsigned int i; - for (i = 0; i < adapter->format_count; ++i) + for (i = 0; i < WINED3D_FORMAT_COUNT; ++i) { struct wined3d_format *format = &adapter->formats[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b96d3a5..69eda3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2665,7 +2665,6 @@ struct wined3d_adapter LUID luid; struct wined3d_format *formats; - unsigned int format_count; const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe;

1 0

Dmitry Timoshkov : msi: Fix a typo.
by Alexandre Julliard 18 Sep '18

18 Sep '18

Module: wine Branch: master Commit: 09e4240f33425eda3ea05eb2a98adaec184b7ba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e4240f33425eda3ea05eb2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 18 13:59:35 2018 +0800 msi: Fix a typo. Should fix the regression introduced by baea371c3d4153bc4a718c07f46971d4d39aa9f3. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 3374964..8e9ae6d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1742,7 +1742,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) { __TRY { - handle = remote_GetActiveDatabase(hInstall); + handle = remote_GetActiveDatabase(remote); handle = alloc_msi_remote_handle(handle); } __EXCEPT(rpc_filter)

1 0

Józef Kucia : d3d11: Add D3D11On12CreateDevice() stub.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 8a985174ebc1b041d9a4f1abbdc184fe692d25bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a985174ebc1b041d9a4f1ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:20:30 2018 +0200 d3d11: Add D3D11On12CreateDevice() stub. 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/d3d11.spec | 1 + dlls/d3d11/d3d11_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 60c77f9..267778a 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -4,6 +4,7 @@ @ stdcall D3D11CoreRegisterLayers() @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) +@ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 5d085ed..6d98116 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -377,3 +377,18 @@ cleanup: return hr; } + +HRESULT WINAPI D3D11On12CreateDevice(IUnknown *device, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level) +{ + FIXME("device %p, flags %#x, feature_levels %p, feature_level_count %u, " + "queues %p, queue_count %u, node_mask 0x%08x, " + "d3d11_device %p, d3d11_immediate_context %p, obtained_feature_level %p stub!\n", + device, flags, feature_levels, feature_level_count, queues, queue_count, + node_mask, d3d11_device, d3d11_immediate_context, obtained_feature_level); + + return E_NOTIMPL; +}

1 0

Józef Kucia : include: Add d3d11on12 header.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 43c0e33f7c96e7439102c0cc5b9c449200de5426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c0e33f7c96e7439102c0cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 17 12:20:29 2018 +0200 include: Add d3d11on12 header. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3d11on12.idl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 74dc293..f90fe84 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -95,6 +95,7 @@ SOURCES = \ d3d11_2.idl \ d3d11_3.idl \ d3d11_4.idl \ + d3d11on12.idl \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ diff --git a/include/d3d11on12.idl b/include/d3d11on12.idl new file mode 100644 index 0000000..4208391 --- /dev/null +++ b/include/d3d11on12.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2018 Józef Kucia + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "d3d11.idl"; +import "d3d12.idl"; + +typedef struct D3D11_RESOURCE_FLAGS +{ + UINT BindFlags; + UINT MiscFlags; + UINT CPUAccessFlags; + UINT StructureByteStride; +} D3D11_RESOURCE_FLAGS; + +[ + uuid(85611e73-70a9-490e-9614-a9e302777904), + object, + local, + pointer_default(unique) +] +interface ID3D11On12Device : IUnknown +{ + HRESULT CreateWrappedResource(IUnknown *d3d12_resource, + const D3D11_RESOURCE_FLAGS *flags, + D3D12_RESOURCE_STATES input_state, + D3D12_RESOURCE_STATES output_state, + REFIID iid, void **d3d11_resource); + + void ReleaseWrappedResources(ID3D11Resource * const *resources, UINT count); + + void AcquireWrappedResources(ID3D11Resource * const *resources, UINT count); +} + +[local] HRESULT __stdcall D3D11On12CreateDevice(IUnknown *device, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level); + +typedef HRESULT (__stdcall *PFN_D3D11ON12_CREATE_DEVICE)(IUnknown *device, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT feature_level_count, + IUnknown * const *queues, UINT queue_count, UINT node_mask, + ID3D11Device **d3d11_device, ID3D11DeviceContext **d3d11_immediate_context, + D3D_FEATURE_LEVEL *obtained_feature_level);

1 0

Alistair Leslie-Hughes : mfplat: Add MFCopyImage stub.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 78dcaa603d3e391f0998c64d11fd9fa285d41f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78dcaa603d3e391f0998c64d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 17 00:50:05 2018 +0000 mfplat: Add MFCopyImage stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index de3926f..bd6b99f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -442,6 +442,11 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } +HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) +{ + FIXME("(%p, %d, %p, %d, %d, %d) stub\n", dest, deststride, src, srcstride, width, lines); + return E_NOTIMPL; +} typedef struct _mfbytestream { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1ab2826..3e42d2f 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -35,7 +35,7 @@ @ stub MFConvertColorInfoToDXVA @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array -@ stub MFCopyImage +@ stdcall MFCopyImage(ptr long ptr long long long) @ stub MFCreateAMMediaTypeFromMFMediaType @ stub MFCreateAlignedMemoryBuffer @ stub MFCreateAsyncResult diff --git a/include/mfapi.h b/include/mfapi.h index 45449b1..bc832bf 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -64,6 +64,7 @@ DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0 typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); +HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type);

1 0

Sven Baars : user32/tests: Use the correct procedure for dialog tests ( Valgrind).
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 470f7b20d468a846f9154450cf2a8000163d5534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=470f7b20d468a846f9154450… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Sep 16 22:07:28 2018 +0200 user32/tests: Use the correct procedure for dialog tests (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 53fa2f1..5db37d4a 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -877,7 +877,7 @@ static void test_builtinproc(void) static LRESULT WINAPI TestDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProcA(hWnd, uMsg, wParam, lParam); + return DefDlgProcA(hWnd, uMsg, wParam, lParam); } static BOOL RegisterTestDialog(HINSTANCE hInstance)

1 0

André Hentschel : kernel32: Add stub for SetProcessWorkingSetSizeEx.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: 7e39544bfa6cf3e68a8567c202624f7f2d3fc7c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e39544bfa6cf3e68a8567c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 16:59:21 2018 +0200 kernel32: Add stub for SetProcessWorkingSetSizeEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45523 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 28 ++++++++++++++++++---- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 42630c1..3200be9 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 6100213..57a5b10 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -21,7 +21,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stub RegisterBadMemoryNotification @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch -@ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx @ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f1d75b8..9db7d98 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1434,7 +1434,7 @@ @ stdcall SetProcessShutdownParameters(long long) # @ stub SetProcessUserModeExceptionPolicy @ stdcall SetProcessWorkingSetSize(long long long) -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) @ stdcall SetSearchPathMode(long) @ stdcall SetStdHandle(long long) # @ stub SetStdHandleEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 85e0042..87c9ed7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3390,22 +3390,22 @@ err: /*********************************************************************** - * SetProcessWorkingSetSize [KERNEL32.@] + * SetProcessWorkingSetSizeEx [KERNEL32.@] * Sets the min/max working set sizes for a specified process. * * PARAMS - * hProcess [I] Handle to the process of interest + * process [I] Handle to the process of interest * minset [I] Specifies minimum working set size * maxset [I] Specifies maximum working set size + * flags [I] Flags to enforce working set sizes * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, - SIZE_T maxset) +BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE process, SIZE_T minset, SIZE_T maxset, DWORD flags) { - WARN("(%p,%ld,%ld): stub - harmless\n",hProcess,minset,maxset); + WARN("(%p,%ld,%ld,%x): stub - harmless\n", process, minset, maxset, flags); if(( minset == (SIZE_T)-1) && (maxset == (SIZE_T)-1)) { /* Trim the working set to zero */ /* Swap the process out of physical RAM */ @@ -3414,6 +3414,24 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, } /*********************************************************************** + * SetProcessWorkingSetSize [KERNEL32.@] + * Sets the min/max working set sizes for a specified process. + * + * PARAMS + * process [I] Handle to the process of interest + * minset [I] Specifies minimum working set size + * maxset [I] Specifies maximum working set size + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetProcessWorkingSetSize(HANDLE process, SIZE_T minset, SIZE_T maxset) +{ + return SetProcessWorkingSetSizeEx(process, minset, maxset, 0); +} + +/*********************************************************************** * K32EmptyWorkingSet (KERNEL32.@) */ BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 89fad2c..2980576 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1461,7 +1461,7 @@ @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters # @ stub SetProcessValidCallTargets -# @ stub SetProcessWorkingSetSizeEx +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx # @ stub SetProtectedPolicy # @ stub SetRoamingLastObservedChangeTime @ stub SetSecurityAccessMask diff --git a/include/winbase.h b/include/winbase.h index 8b26308..4d959d0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2597,6 +2597,7 @@ WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); +WINBASEAPI BOOL WINAPI SetProcessWorkingSetSizeEx(HANDLE,SIZE_T,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI SetSearchPathMode(DWORD); WINADVAPI BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); WINADVAPI BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2018