wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Piotr Caban : msvcrt: Add CurrentScheduler::Create implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: b77542f9a210f46d21fa54191207de28f6b5a4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77542f9a210f46d21fa54191… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:36 2017 +0200 msvcrt: Add CurrentScheduler::Create implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 1 + dlls/msvcrt/scheduler.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 700ca8b..aefebdc 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -268,6 +268,7 @@ extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; extern void *vtbl_wrapper_8; extern void *vtbl_wrapper_20; +extern void *vtbl_wrapper_28; #else diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 11cb7c1..4a8eb8e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -50,6 +50,7 @@ DEFINE_VTBL_WRAPPER(0); DEFINE_VTBL_WRAPPER(4); DEFINE_VTBL_WRAPPER(8); DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(28); #endif @@ -114,6 +115,7 @@ typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) +#define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) typedef struct { Scheduler scheduler; @@ -757,7 +759,12 @@ void __cdecl Scheduler_SetDefaultSchedulerPolicy(const SchedulerPolicy *policy) /* ?Create@CurrentScheduler@Concurrency@@SAXAEBVSchedulerPolicy@2@@Z */ void __cdecl CurrentScheduler_Create(const SchedulerPolicy *policy) { - FIXME("(%p) stub\n", policy); + Scheduler *scheduler; + + TRACE("(%p)\n", policy); + + scheduler = Scheduler_Create(policy); + call_Scheduler_Attach(scheduler); } /* ?Detach@CurrentScheduler@Concurrency@@SAXXZ */

1 0

Piotr Caban : msvcrt: Add CurrentScheduler class stub.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 82fb8a5d13d21408fddc64ca2674a08fdbfc9b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fb8a5d13d21408fddc64ca2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:28 2017 +0200 msvcrt: Add CurrentScheduler class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 40 ++++++++--------- dlls/msvcr100/msvcr100.spec | 28 ++++++------ dlls/msvcr110/msvcr110.spec | 40 ++++++++--------- dlls/msvcr120/msvcr120.spec | 40 ++++++++--------- dlls/msvcr120_app/msvcr120_app.spec | 40 ++++++++--------- dlls/msvcrt/scheduler.c | 88 +++++++++++++++++++++++++++++++++++++ 6 files changed, 182 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82fb8a5d13d21408fddc6…

1 0

Piotr Caban : msvcrt: Add ThreadScheduler::Attach implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: dbb4e8553ffcea1ee8e679304b17bf96b6451382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb4e8553ffcea1ee8e679304… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:23 2017 +0200 msvcrt: Add ThreadScheduler::Attach implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 3247b63..f0fda9f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -96,17 +96,24 @@ union allocator_cache_entry { } alloc; }; +struct scheduler_list { + struct Scheduler *scheduler; + struct scheduler_list *next; +}; + typedef struct { Context context; + struct scheduler_list scheduler; unsigned int id; union allocator_cache_entry *allocator_cache[8]; } ExternalContextBase; extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); -typedef struct { +typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; +#define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) typedef struct { Scheduler scheduler; @@ -255,6 +262,7 @@ MSVCRT_bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const External static void ExternalContextBase_dtor(ExternalContextBase *this) { + struct scheduler_list *scheduler_cur, *scheduler_next; union allocator_cache_entry *next, *cur; int i; @@ -265,6 +273,16 @@ static void ExternalContextBase_dtor(ExternalContextBase *this) MSVCRT_operator_delete(cur); } } + + if (this->scheduler.scheduler) { + call_Scheduler_Release(this->scheduler.scheduler); + + for(scheduler_cur=this->scheduler.next; scheduler_cur; scheduler_cur=scheduler_next) { + scheduler_next = scheduler_cur->next; + call_Scheduler_Release(scheduler_cur->scheduler); + MSVCRT_operator_delete(scheduler_cur); + } + } } DEFINE_THISCALL_WRAPPER(ExternalContextBase_vector_dtor, 8) @@ -291,9 +309,9 @@ static void ExternalContextBase_ctor(ExternalContextBase *this) { TRACE("(%p)->()\n", this); + memset(this, 0, sizeof(*this)); this->context.vtable = &MSVCRT_ExternalContextBase_vtable; this->id = InterlockedIncrement(&context_id); - memset(this->allocator_cache, 0, sizeof(this->allocator_cache)); } /* ?Alloc@Concurrency@@YAPAXI@Z */ @@ -607,7 +625,25 @@ void __thiscall ThreadScheduler_RegisterShutdownEvent(ThreadScheduler *this, HAN DEFINE_THISCALL_WRAPPER(ThreadScheduler_Attach, 4) void __thiscall ThreadScheduler_Attach(ThreadScheduler *this) { - FIXME("(%p) stub\n", this); + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + + TRACE("(%p)\n", this); + + if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return; + } + + if(context->scheduler.scheduler == &this->scheduler) + throw_exception(EXCEPTION_IMPROPER_SCHEDULER_ATTACH, 0, NULL); + + if(context->scheduler.scheduler) { + struct scheduler_list *l = MSVCRT_operator_new(sizeof(*l)); + *l = context->scheduler; + context->scheduler.next = l; + } + context->scheduler.scheduler = &this->scheduler; + ThreadScheduler_Reference(this); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_CreateScheduleGroup_loc, 8)

1 0

Piotr Caban : msvcrt: Add improper_scheduler_attach class implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 1e580320987aec8ba3d10142be0ef2b027c50f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e580320987aec8ba3d10142b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:18 2017 +0200 msvcrt: Add improper_scheduler_attach class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 +++--- dlls/msvcr100/msvcr100.spec | 8 +++--- dlls/msvcr110/msvcr110.spec | 12 ++++---- dlls/msvcr120/msvcr120.spec | 12 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++---- dlls/msvcrt/cpp.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 7 files changed, 82 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e580320987aec8ba3d10…

1 0

Piotr Caban : msvcrt: Add ThreadScheduler:: RegisterShutdownEvent implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 4a184a59a16a2c7eaf41a68f8a8953484980f73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a184a59a16a2c7eaf41a68f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:12 2017 +0200 msvcrt: Add ThreadScheduler::RegisterShutdownEvent implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 48a9d1b..3247b63 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -114,6 +114,10 @@ typedef struct { unsigned int id; unsigned int virt_proc_no; SchedulerPolicy policy; + int shutdown_count; + int shutdown_size; + HANDLE *shutdown_events; + CRITICAL_SECTION cs; } ThreadScheduler; extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; @@ -522,8 +526,17 @@ void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this) static void ThreadScheduler_dtor(ThreadScheduler *this) { + int i; + if(this->ref != 0) WARN("ref = %d\n", this->ref); SchedulerPolicy_dtor(&this->policy); + + for(i=0; i<this->shutdown_count; i++) + SetEvent(this->shutdown_events[i]); + MSVCRT_operator_delete(this->shutdown_events); + + this->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&this->cs); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Id, 4) @@ -572,7 +585,23 @@ unsigned int __thiscall ThreadScheduler_Release(ThreadScheduler *this) DEFINE_THISCALL_WRAPPER(ThreadScheduler_RegisterShutdownEvent, 8) void __thiscall ThreadScheduler_RegisterShutdownEvent(ThreadScheduler *this, HANDLE event) { - FIXME("(%p %p) stub\n", this, event); + HANDLE *shutdown_events; + int size; + + TRACE("(%p %p)\n", this, event); + + EnterCriticalSection(&this->cs); + + size = this->shutdown_size ? this->shutdown_size * 2 : 1; + shutdown_events = MSVCRT_operator_new(size * sizeof(*shutdown_events)); + memcpy(shutdown_events, this->shutdown_events, + this->shutdown_count * sizeof(*shutdown_events)); + MSVCRT_operator_delete(this->shutdown_events); + this->shutdown_size = size; + this->shutdown_events = shutdown_events; + this->shutdown_events[this->shutdown_count++] = event; + + LeaveCriticalSection(&this->cs); } DEFINE_THISCALL_WRAPPER(ThreadScheduler_Attach, 4) @@ -654,6 +683,12 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this, this->virt_proc_no = SchedulerPolicy_GetPolicyValue(&this->policy, MaxConcurrency); if(this->virt_proc_no > si.dwNumberOfProcessors) this->virt_proc_no = si.dwNumberOfProcessors; + + this->shutdown_count = this->shutdown_size = 0; + this->shutdown_events = NULL; + + InitializeCriticalSection(&this->cs); + this->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ThreadScheduler"); return this; }

1 0

Henri Verbeet : wined3d: Use the blitter interface in swapchain_blit().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: a80f9a867f95e2d2305d386ebebc14660c6c002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80f9a867f95e2d2305d386eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 30 23:15:32 2017 +0200 wined3d: Use the blitter interface in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 82 +++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 89181d1..07ca476 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -305,78 +305,38 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, { struct wined3d_texture *texture = swapchain->back_buffers[0]; struct wined3d_surface *back_buffer = texture->sub_resources[0].u.surface; - struct wined3d_surface *front_buffer = swapchain->front_buffer->sub_resources[0].u.surface; - UINT src_w = src_rect->right - src_rect->left; - UINT src_h = src_rect->bottom - src_rect->top; - GLenum gl_filter; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_device *device = swapchain->device; + const struct wined3d_blitter_ops *blitter; enum wined3d_texture_filter_type filter; - RECT win_rect; - UINT win_h; + DWORD location; TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); - if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) - { - filter = WINED3D_TEXF_NONE; - gl_filter = GL_NEAREST; - } - else + if (!(blitter = wined3d_select_blitter(&device->adapter->gl_info, + &device->adapter->d3d_info, WINED3D_BLIT_OP_COLOR_BLIT, + src_rect, texture->resource.usage, texture->resource.pool, texture->resource.format, + dst_rect, texture->resource.usage, texture->resource.pool, texture->resource.format))) { - filter = WINED3D_TEXF_LINEAR; - gl_filter = GL_LINEAR; + FIXME("No blitter supports the requested blit.\n"); + return; } - GetClientRect(swapchain->win_handle, &win_rect); - win_h = win_rect.bottom - win_rect.top; - - if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(texture->resource.format->color_fixup)) - { - DWORD location = WINED3D_LOCATION_TEXTURE_RGB; - - if (texture->resource.multisample_type) - { - location = WINED3D_LOCATION_RB_RESOLVED; - wined3d_texture_load_location(texture, 0, context, location); - } - - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, back_buffer, NULL, location); - gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); - context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); - context_set_draw_buffer(context, GL_BACK); - context_invalidate_state(context, STATE_FRAMEBUFFER); - - gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE)); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1)); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2)); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE3)); - - gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE)); - - /* Note that the texture is upside down */ - gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, - dst_rect->left, win_h - dst_rect->top, dst_rect->right, win_h - dst_rect->bottom, - GL_COLOR_BUFFER_BIT, gl_filter); - checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); - } + if ((src_rect->right - src_rect->left == dst_rect->right - dst_rect->left + && src_rect->bottom - src_rect->top == dst_rect->bottom - dst_rect->top) + || is_complex_fixup(texture->resource.format->color_fixup)) + filter = WINED3D_TEXF_NONE; else - { - struct wined3d_device *device = swapchain->device; + filter = WINED3D_TEXF_LINEAR; - if (is_complex_fixup(texture->resource.format->color_fixup)) - filter = WINED3D_TEXF_NONE; + location = WINED3D_LOCATION_TEXTURE_RGB; + if (texture->resource.multisample_type) + location = WINED3D_LOCATION_RB_RESOLVED; - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, - back_buffer, WINED3D_LOCATION_TEXTURE_RGB, src_rect, - back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect, - NULL, filter); - checkGLcall("Swapchain present blit(manual)\n"); - } + wined3d_texture_validate_location(texture, 0, WINED3D_LOCATION_DRAWABLE); + blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, back_buffer, location, + src_rect, back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect, NULL, filter); + wined3d_texture_invalidate_location(texture, 0, WINED3D_LOCATION_DRAWABLE); } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Make the FBO blitter a proper blitter.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 4b4091fa6282928bfed099c0c96add40211111ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4091fa6282928bfed099c0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 30 23:15:31 2017 +0200 wined3d: Make the FBO blitter a proper blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 152 ++++++++++++++++++++++++-------------- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 104 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b4091fa6282928bfed09…

1 0

Henri Verbeet : wined3d: Get rid of the unused "priv" argument to arbfp_gen_plain_shader().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 54273be2001392f61864818d2e5dc8f98a003778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54273be2001392f61864818d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 30 23:15:30 2017 +0200 wined3d: Get rid of the unused "priv" argument to arbfp_gen_plain_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ce16f9f..4f8a358 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7520,8 +7520,7 @@ static GLuint gen_yuv_shader(const struct wined3d_gl_info *gl_info, const struct } /* Context activation is done by the caller. */ -static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, - const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) +static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { GLuint shader; struct wined3d_string_buffer buffer; @@ -7641,7 +7640,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, case COMPLEX_FIXUP_NONE: if (!is_identity_fixup(texture->resource.format->color_fixup)) FIXME("Implement support for sign or swizzle fixups.\n"); - shader = arbfp_gen_plain_shader(priv, gl_info, &type); + shader = arbfp_gen_plain_shader(gl_info, &type); break; case COMPLEX_FIXUP_P8:

1 0

Henri Verbeet : wined3d: Get rid of the unused "priv" parameter to gen_yuv_shader().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 22c19e855fa9ae7b5d2cc215fb940429eac2a74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c19e855fa9ae7b5d2cc215f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 30 23:15:29 2017 +0200 wined3d: Get rid of the unused "priv" parameter to gen_yuv_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8808de5..ce16f9f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7396,8 +7396,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d } /* Context activation is done by the caller. */ -static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, - const struct arbfp_blit_type *type) +static GLuint gen_yuv_shader(const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { GLuint shader; struct wined3d_string_buffer buffer; @@ -7653,7 +7652,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: - shader = gen_yuv_shader(priv, gl_info, &type); + shader = gen_yuv_shader(gl_info, &type); break; }

1 0

Henri Verbeet : wined3d: Get rid of the unused "priv" parameter to gen_p8_shader().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: a61ee2b4991ca2d35f5835a430e0aa34029d90df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61ee2b4991ca2d35f5835a43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 30 23:15:28 2017 +0200 wined3d: Get rid of the unused "priv" parameter to gen_p8_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 90e0a66..8808de5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7308,8 +7308,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb } /* Context activation is done by the caller. */ -static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, - const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) +static GLuint gen_p8_shader(const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { GLuint shader; struct wined3d_string_buffer buffer; @@ -7647,7 +7646,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, break; case COMPLEX_FIXUP_P8: - shader = gen_p8_shader(priv, gl_info, &type); + shader = gen_p8_shader(gl_info, &type); break; case COMPLEX_FIXUP_YUY2:

1 0

← Newer
1
2
3
4
5
6
7
...
72
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 March 2017