wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Dmitry Timoshkov : windowscodecs: Correct IWICBitmapScaler::CopyPixels() error for not initialized case.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: b4035288b7e9b5645d37e3c53e60ab1416d74db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4035288b7e9b5645d37e3c5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 10:53:00 2019 +0800 windowscodecs: Correct IWICBitmapScaler::CopyPixels() error for not initialized case. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index c6c758d..201cf5f 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -225,7 +225,7 @@ static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, if (!This->source) { - hr = WINCODEC_ERR_WRONGSTATE; + hr = WINCODEC_ERR_NOTINITIALIZED; goto end; } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 7480820..278c8a8 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1163,6 +1163,7 @@ static void test_bitmap_scaler(void) double res_x, res_y; IWICBitmap *bitmap; UINT width, height; + BYTE buf[16]; HRESULT hr; hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -1240,6 +1241,9 @@ static void test_bitmap_scaler(void) hr = IWICBitmapScaler_GetSize(scaler, &width, &height); ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPixels(scaler, NULL, 1, sizeof(buf), buf); + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 0, 2, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);

1 0

Matteo Bruni : wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 6f38a7443c12d0d8cbfa5d26433cb2a2b7bcd015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f38a7443c12d0d8cbfa5d26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:32 2019 +0200 wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2837f6e..5524f94 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4345,11 +4345,13 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + if (gl_info->supported[ARB_SAMPLER_OBJECTS] || gl_info->supported[EXT_TEXTURE_LOD_BIAS]) + caps->RasterCaps |= WINED3DPRASTERCAPS_MIPMAPLODBIAS; + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) { caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY - | WINED3DPRASTERCAPS_ZBIAS - | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + | WINED3DPRASTERCAPS_ZBIAS; caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC;

1 0

Matteo Bruni : wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0f209a930112ea3a3e3f7fc3292072ac8fab9446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f209a930112ea3a3e3f7fc3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:31 2019 +0200 wined3d: Always report support for ZBIAS and MIPMAPLODBIAS raster caps in the Vulkan backend. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b8d94a0..57235bb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -337,11 +337,11 @@ static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS | WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; + caps->RasterCaps |= WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + if (sampler_anisotropy) { - caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY - | WINED3DPRASTERCAPS_ZBIAS - | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY; caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | WINED3DPTFILTERCAPS_MINFANISOTROPIC;

1 0

Matteo Bruni : winecfg: Don't mark glu32 as builtin-only.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 1e145b12a745faba3ea9492b060fb14590251ed8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e145b12a745faba3ea9492b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:30 2019 +0200 winecfg: Don't mark glu32 as builtin-only. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index ee60978..a8c3e80 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -52,7 +52,6 @@ static const char * const builtin_only[] = "dbghelp", "ddraw", "gdi32", - "glu32", "gphoto2.ds", "icmp", "iphlpapi",

1 0

Matteo Bruni : wined3d: Add ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE to core_extensions[].
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: cf0b9d4238680fcdc131c72baa0b992ac12fa948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf0b9d4238680fcdc131c72b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 15 23:39:28 2019 +0200 wined3d: Add ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE to core_extensions[]. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e2cd96f..2837f6e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3343,6 +3343,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, + {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)},

1 0

Paul Gofman : wined3d: Factor out compute_normal_matrix() function.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 57bb929e8a10a8faef37fa9753406f4075472f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57bb929e8a10a8faef37fa97… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:52 2019 +0300 wined3d: Factor out compute_normal_matrix() function. 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/wined3d/glsl_shader.c | 289 +--------------------------------------- dlls/wined3d/utils.c | 294 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 + 3 files changed, 301 insertions(+), 287 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57bb929e8a10a8faef37…

1 0

Paul Gofman : wined3d: Move validate_material_colour_source() to wined3d_private.h.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0d79d3625ed31df62294c6ae78e63c47991d6c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d79d3625ed31df62294c6ae… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:50 2019 +0300 wined3d: Move validate_material_colour_source() to wined3d_private.h. 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/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 669c8cb..06ff97c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6378,16 +6378,6 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); } -static enum wined3d_material_color_source validate_material_colour_source(WORD use_map, - enum wined3d_material_color_source source) -{ - if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) - return source; - if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) - return source; - return WINED3D_MCS_MATERIAL; -} - void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2525fca..0a629dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4840,6 +4840,16 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) assert(cs->thread_id != GetCurrentThreadId()); } +static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map, + enum wined3d_material_color_source source) +{ + if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + return source; + if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + return source; + return WINED3D_MCS_MATERIAL; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Paul Gofman : ddraw: Enable lighting only if material is set in d3d_execute_buffer_execute().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: ae2696c992a0bf0971b8b2e6df847bea51f8d3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae2696c992a0bf0971b8b2e6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:49 2019 +0300 ddraw: Enable lighting only if material is set in d3d_execute_buffer_execute(). 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/ddraw/executebuffer.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 637c2bd..d5de513 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -306,21 +306,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); - if (op == D3DPROCESSVERTICES_TRANSFORMLIGHT) - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - ddraw_find_decl(device->ddraw, D3DFVF_VERTEX)); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_LIGHTING, TRUE); - } - else - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - ddraw_find_decl(device->ddraw, D3DFVF_LVERTEX)); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_LIGHTING, FALSE); - } - + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, + op == D3DPROCESSVERTICES_TRANSFORMLIGHT && !!device->material); + wined3d_device_set_vertex_declaration(device->wined3d_device, + ddraw_find_decl(device->ddraw, op == D3DPROCESSVERTICES_TRANSFORMLIGHT + ? D3DFVF_VERTEX : D3DFVF_LVERTEX)); wined3d_device_process_vertices(device->wined3d_device, ci->wStart, ci->wDest, ci->dwCount, buffer->dst_vertex_buffer, NULL, 0, D3DFVF_TLVERTEX); break;

1 0

Paul Gofman : ddraw: Fix setting current viewport for ddraw1.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 8bc7139b6fe27ba8fe80ae3414dee436d5b92f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc7139b6fe27ba8fe80ae34… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:48 2019 +0300 ddraw: Fix setting current viewport for ddraw1. 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/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +++++- dlls/ddraw/executebuffer.c | 13 +------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 19f21a8..7137f78 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -555,7 +555,7 @@ struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExec /* The execute function */ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *execute_buffer, - struct d3d_device *device, struct d3d_viewport *viewport) DECLSPEC_HIDDEN; + struct d3d_device *device) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 18e5854..ade56bb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,9 +712,13 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface, if(!buffer) return DDERR_INVALIDPARAMS; + if (FAILED(hr = IDirect3DDevice3_SetCurrentViewport + (&device->IDirect3DDevice3_iface, &viewport_impl->IDirect3DViewport3_iface))) + return hr; + /* Execute... */ wined3d_mutex_lock(); - hr = d3d_execute_buffer_execute(buffer, device, viewport_impl); + hr = d3d_execute_buffer_execute(buffer, device); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index f9082dc..637c2bd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -48,8 +48,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { TRACE("lpData : %p\n", lpDesc->lpData); } -HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, - struct d3d_device *device, struct d3d_viewport *viewport) +HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d_device *device) { DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; @@ -58,16 +57,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct wined3d_box box = {0}; HRESULT hr; - if (viewport->active_device != device) - { - WARN("Viewport %p active device is %p.\n", - viewport, viewport->active_device); - return DDERR_INVALIDPARAMS; - } - - /* Activate the viewport */ - viewport_activate(viewport, FALSE); - TRACE("ExecuteData :\n"); if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data));

1 0

Henri Verbeet : wined3d: Use context_acquire() in wined3d_swapchain_cs_init().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: db201072655946662c041a66ee434c30c245e5b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db201072655946662c041a66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:53:00 2019 +0430 wined3d: Use context_acquire() in wined3d_swapchain_cs_init(). Instead of calling context_create() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/swapchain.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 38a4462..7cd16d5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4264,7 +4264,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(texture->swapchain); + if (!(context = swapchain_get_context(texture->swapchain))) + return NULL; } else { @@ -4274,8 +4275,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, * context for the primary swapchain. */ if (current_context && current_context->device == device) context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); + else if (!(context = swapchain_get_context(device->swapchains[0]))) + return NULL; } context_activate(context, texture, sub_resource_idx); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f47c1a4..fbedd74 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -720,20 +720,20 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; + struct wined3d_context *context; - if (!(swapchain->context[0] = context_create(swapchain))) + if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) { - WARN("Failed to create context.\n"); + WARN("Failed to acquire context.\n"); return; } - swapchain->num_contexts = 1; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (!swapchain->desc.enable_auto_depth_stencil || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) FIXME("Add OpenGL context recreation support.\n"); - context_release(swapchain->context[0]); + context_release(context); } void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device)

1 0

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 May 2019