May 2019 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Report WINED3DPRASTERCAPS_MIPMAPLODBIAS only when supported.
by Alexandre Julliard May 16, 2019

May 16, 2019

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

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

May 16, 2019

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

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

May 16, 2019

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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 66156781eebaecae43af4855246a1204405fcea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66156781eebaecae43af4855… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:57 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db3c4ee..2670b41 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -540,17 +540,16 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * } /* Context activation is done by the caller. */ -static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -579,6 +578,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *rt_texture, *ds_texture; @@ -695,7 +695,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else { entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); - context_reuse_fbo_entry(context, target, render_targets, depth_stencil, color_location, ds_location, entry); + wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, + depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); list_add_head(&context->fbo_list, &entry->entry); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 9729f15acc1a0c841596c02a5faa9d2a80901d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9729f15acc1a0c841596c02a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:56 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6d94f2..db3c4ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -99,10 +99,9 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) +static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl, GLuint fbo) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); @@ -568,7 +567,7 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - context_destroy_fbo(context, entry->id); + wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); } --context->fbo_entry_count; list_remove(&entry->entry);

1 0

Alexandre Julliard : msvcrt: Update arguments for some forwarded functions.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 7b8d104d6682785fe395d7651f33fb9941f64314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8d104d6682785fe395d765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 20:54:02 2019 +0200 msvcrt: Update arguments for some forwarded functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 4ba1825..1535456 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -36,8 +36,8 @@ @ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @@ -521,8 +521,8 @@ @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z @ stub -arch=win64 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PEAV12(a)I@Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z @ stub -arch=win32 ?wait_for_all(a)agent@Concurrency@@SAXIPAPAV12(a)PAW4agent_status@2(a)I@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a9c21cb..af6b0fe 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -48,9 +48,9 @@ @ cdecl -arch=arm ??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ cdecl -arch=arm ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @@ -790,9 +790,9 @@ @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z -@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ cdecl -arch=arm ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z

1 0

Dmitry Timoshkov : windowscodecs: Simplify some IMILBitmapScaler forwarders.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 6ebc9dd42fd25e2a89f33145168d24f1930638f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebc9dd42fd25e2a89f33145… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 16 10:53:06 2019 +0800 windowscodecs: Simplify some IMILBitmapScaler forwarders. 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 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 201cf5f..d6e56d0 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -416,12 +416,7 @@ static HRESULT WINAPI IMILBitmapScaler_GetSize(IMILBitmapScaler *iface, UINT *width, UINT *height) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%p)\n", iface, width, height); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_GetSize(&This->IWICBitmapScaler_iface, width, height); } @@ -452,12 +447,7 @@ static HRESULT WINAPI IMILBitmapScaler_GetResolution(IMILBitmapScaler *iface, double *dpix, double *dpiy) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%p)\n", iface, dpix, dpiy); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_GetResolution(&This->IWICBitmapScaler_iface, dpix, dpiy); } @@ -478,12 +468,7 @@ static HRESULT WINAPI IMILBitmapScaler_CopyPixels(IMILBitmapScaler *iface, const WICRect *rc, UINT stride, UINT size, BYTE *buffer) { BitmapScaler *This = impl_from_IMILBitmapScaler(iface); - TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, size, buffer); - - if (!This->source) - return WINCODEC_ERR_NOTINITIALIZED; - return IWICBitmapScaler_CopyPixels(&This->IWICBitmapScaler_iface, rc, stride, size, buffer); }

1 0

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

May 16, 2019

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

May 16, 2019

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 : ddraw: Enable lighting only if material is set in d3d_execute_buffer_execute().
by Alexandre Julliard May 16, 2019

May 16, 2019

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