wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Henri Verbeet : wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a04f0e9c789295c22aab6e0d3b3239d0c794b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04f0e9c789295c22aab6e0d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:35:00 2011 +0200 wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 293 +++++++++++++++++++++++------------------------- 1 files changed, 140 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04f0e9c789295c22aab6…

1 0

Henri Verbeet : wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: d063ff55e7f3639e492e24b6dcef8e8489825569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d063ff55e7f3639e492e24b6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:59 2011 +0200 wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 165 ++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 83 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9b02177..62828e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1210,6 +1210,73 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } +/* This function checks if the primary render target uses the 8bit paletted format. */ +static BOOL primary_render_target_is_p8(const struct wined3d_device *device) +{ + if (device->fb.render_targets && device->fb.render_targets[0]) + { + const struct wined3d_surface *render_target = device->fb.render_targets[0]; + if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) + return TRUE; + } + return FALSE; +} + +static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, + DWORD color, WINED3DCOLORVALUE *float_color) +{ + const struct wined3d_format *format = surface->resource.format; + const struct wined3d_device *device = surface->resource.device; + + switch (format->id) + { + case WINED3DFMT_P8_UINT: + if (surface->palette) + { + float_color->r = surface->palette->palents[color].peRed / 255.0f; + float_color->g = surface->palette->palents[color].peGreen / 255.0f; + float_color->b = surface->palette->palents[color].peBlue / 255.0f; + } + else + { + float_color->r = 0.0f; + float_color->g = 0.0f; + float_color->b = 0.0f; + } + float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + break; + + case WINED3DFMT_B5G6R5_UNORM: + float_color->r = ((color >> 11) & 0x1f) / 31.0f; + float_color->g = ((color >> 5) & 0x3f) / 63.0f; + float_color->b = (color & 0x1f) / 31.0f; + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8A8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = D3DCOLOR_A(color); + break; + + default: + ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); + return FALSE; + } + + return TRUE; +} + static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format; @@ -1464,6 +1531,21 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } } + else + { + if (flags & WINEDDBLT_COLORFILL) + { + WINED3DCOLORVALUE color; + + TRACE("Color fill.\n"); + + if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + goto fallback; + + if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) + return WINED3D_OK; + } + } fallback: @@ -2029,19 +2111,6 @@ void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info } } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; -} - /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -2523,60 +2592,6 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *d } } -static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, - DWORD color, WINED3DCOLORVALUE *float_color) -{ - const struct wined3d_format *format = surface->resource.format; - const struct wined3d_device *device = surface->resource.device; - - switch (format->id) - { - case WINED3DFMT_P8_UINT: - if (surface->palette) - { - float_color->r = surface->palette->palents[color].peRed / 255.0f; - float_color->g = surface->palette->palents[color].peGreen / 255.0f; - float_color->b = surface->palette->palents[color].peBlue / 255.0f; - } - else - { - float_color->r = 0.0f; - float_color->g = 0.0f; - float_color->b = 0.0f; - } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; - - default: - ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); - return FALSE; - } - - return TRUE; -} - HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -5552,22 +5567,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3D_OK; } - else - { - /* Source-Less Blit to render target */ - if (flags & WINEDDBLT_COLORFILL) - { - WINED3DCOLORVALUE color; - - TRACE("Colorfill\n"); - - /* The color as given in the Blt function is in the surface format. */ - if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) - return WINED3DERR_INVALIDCALL; - - return surface_color_fill(dst_surface, dst_rect, &color); - } - } /* Default: Fall back to the generic blt. Not an error, a TRACE is enough */ TRACE("Didn't find any usable render target setup for hw blit, falling back to software\n");

1 0

Henri Verbeet : wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a887128ffddf4d44569cd8480387409533c95e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a887128ffddf4d44569cd8480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:58 2011 +0200 wined3d: Reject color fills on sysmem surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 087196c..9b02177 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,6 +6367,9 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: + if (dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET)))

1 0

Henri Verbeet : wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 18434ddc57c049e1f78d79471651d73d0dbc5f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18434ddc57c049e1f78d79471… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:57 2011 +0200 wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill(). And avoid a potential infinite recursion if wined3d_surface_blt() ends up calling cpu_blit_color_fill(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d7d65fb..087196c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7024,12 +7024,13 @@ release: static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { + static const RECT src_rect; WINEDDBLTFX BltFx; memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color); - return wined3d_surface_blt(dst_surface, dst_rect, NULL, NULL, + return surface_cpu_blt(dst_surface, dst_rect, NULL, &src_rect, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); }

1 0

Henri Verbeet : wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 26484c92005c74d88b3cc2a6c1e3896e2e8941ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=26484c92005c74d88b3cc2a6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:56 2011 +0200 wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8412aa5..d7d65fb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,12 +6367,20 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + return FALSE; + } + else if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Color fill not supported\n"); return FALSE; } + /* FIXME: We should reject color fills on formats with fixups, + * but this would break P8 color fills for example. */ + return TRUE; case WINED3D_BLIT_OP_DEPTH_FILL:

1 0

Henri Verbeet : wined3d: Don' t allow blits with an invalid destination rectangle when a clipper is set either .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e1ab5f6e6bf251566289ccf3177ebaf8102cb72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ab5f6e6bf251566289ccf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:55 2011 +0200 wined3d: Don't allow blits with an invalid destination rectangle when a clipper is set either. Clippers don't really work. Previously we mostly didn't run into this because the rectangle was already rejected by ddraw_surface7_Blt(), although ddraw_surface7_BltFast() might have been affected in a couple of cases. We should of course implement clippers, but until that happens, completely rejecting the blit is better than introducing memory corruption. This fixes a regression introduced by commit 92e616f355ded5f3634625dba245e9b437e3ad6a. --- dlls/wined3d/surface.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88e8a1d..8412aa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1307,15 +1307,18 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - /* The destination rect can be out of bounds on the condition - * that a clipper is set for the surface. */ - if (!dst_surface->clipper && (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom + if (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom || dst_rect.left > dst_surface->resource.width || dst_rect.left < 0 || dst_rect.top > dst_surface->resource.height || dst_rect.top < 0 || dst_rect.right > dst_surface->resource.width || dst_rect.right < 0 - || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0)) + || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0) { - WARN("Application gave us bad destination rectangle for blit without a clipper set.\n"); + /* The destination rect can be out of bounds on the condition + * that a clipper is set for the surface. */ + if (dst_surface->clipper) + FIXME("Blit clipping not implemented.\n"); + else + WARN("The application gave us a bad destination rectangle without a clipper set.\n"); return WINEDDERR_INVALIDRECT; }

1 0

Henri Verbeet : wined3d: Draw buffers are per-framebuffer state.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: f8ce77a5986ce0648dc6cbaef77ddf6828ea1e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ce77a5986ce0648dc6cbaef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:54 2011 +0200 wined3d: Draw buffers are per-framebuffer state. --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac5a05a..53aeca3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -268,6 +268,17 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ } } +static inline DWORD context_generate_rt_mask(GLenum buffer) +{ + /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ + return buffer ? (1 << 31) | buffer : 0; +} + +static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) +{ + return (1 << 31) | surface_get_gl_buffer(target); +} + static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, struct wined3d_surface **render_targets, struct wined3d_surface *depth_stencil, DWORD location) { @@ -279,6 +290,7 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); entry->depth_stencil = depth_stencil; entry->location = location; + entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; entry->id = 0; @@ -1204,17 +1216,6 @@ static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, return iPixelFormat; } -static inline DWORD context_generate_rt_mask(GLenum buffer) -{ - /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ - return buffer ? (1 << 31) | buffer : 0; -} - -static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) -{ - return (1 << 31) | surface_get_gl_buffer(target); -} - /* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) @@ -1875,7 +1876,10 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - context->draw_buffers_mask = context_generate_rt_mask(buffer); + if (context->current_fbo) + context->current_fbo->rt_mask = context_generate_rt_mask(buffer); + else + context->draw_buffers_mask = context_generate_rt_mask(buffer); } static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) @@ -1942,7 +1946,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { - DWORD rt_mask; + DWORD rt_mask, old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -1973,8 +1977,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de rt_mask = context_generate_rt_mask_no_fbo(device, context->current_rt); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2011,7 +2017,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { - DWORD rt_mask = 0; + DWORD rt_mask = 0, old_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2075,8 +2081,10 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2142,6 +2150,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat const struct wined3d_device *device = context->swapchain->device; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); + DWORD old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2157,7 +2166,8 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } - if (context->draw_buffers_mask != rt_mask) + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2168,12 +2178,13 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - DWORD rt_mask; + DWORD rt_mask, old_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; rt_mask = find_draw_buffers_mask(context, device); - if (context->draw_buffers_mask != rt_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 044e0df..5e20740 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,6 +1944,7 @@ struct fbo_entry struct wined3d_surface **render_targets; struct wined3d_surface *depth_stencil; DWORD location; + DWORD rt_mask; BOOL attached; GLuint id; };

1 0

Henri Verbeet : wined3d: Merge FindContext() into context_acquire().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 34b2956e23a03458ed4c13d7556eb5438cb3fa1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b2956e23a03458ed4c13d75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:53 2011 +0200 wined3d: Merge FindContext() into context_acquire(). This actually fixes a bug. A context's current_rt field may get set to NULL if that surface gets destroyed or unloaded. In general, the next time that context is acquired, context_setup_target() will then set everything up again. However, if a context_acquire() call with a NULL target ends up returning such a context, context_setup_target() never sets the current_rt field because the target FindContext() chooses never gets propagated to context_acquire(). This patch ensures context_setup_target() is never called with a NULL target. --- dlls/wined3d/context.c | 99 +++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac252d8..ac5a05a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1811,59 +1811,6 @@ static void SetupForBlit(struct wined3d_device *device, struct wined3d_context * context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_PROJECTION)); } -/* Do not call while under the GL lock. */ -static struct wined3d_context *FindContext(const struct wined3d_device *device, const struct wined3d_surface *target) -{ - struct wined3d_context *current_context = context_get_current(); - struct wined3d_context *context; - - if (current_context && current_context->destroyed) current_context = NULL; - - if (!target) - { - if (current_context - && current_context->current_rt - && current_context->swapchain->device == device) - { - target = current_context->current_rt; - } - else - { - struct wined3d_swapchain *swapchain = device->swapchains[0]; - if (swapchain->back_buffers) target = swapchain->back_buffers[0]; - else target = swapchain->front_buffer; - } - } - - if (current_context && current_context->current_rt == target) - { - context_update_window(current_context); - return current_context; - } - - if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) - { - TRACE("Rendering onscreen\n"); - - context = swapchain_get_context(target->container.u.swapchain); - } - else - { - TRACE("Rendering offscreen\n"); - - /* Stay with the current context if possible. Otherwise use the - * context for the primary swapchain. */ - if (current_context && current_context->swapchain->device == device) - context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); - } - - context_update_window(context); - - return context; -} - static inline BOOL is_rt_mask_onscreen(DWORD rt_mask) { return rt_mask & (1 << 31); @@ -2290,7 +2237,6 @@ static void context_setup_target(struct wined3d_device *device, { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - if (!target) return; render_offscreen = surface_is_offscreen(target); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; @@ -2347,7 +2293,50 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi TRACE("device %p, target %p.\n", device, target); - context = FindContext(device, target); + if (current_context && current_context->destroyed) + current_context = NULL; + + if (!target) + { + if (current_context + && current_context->current_rt + && current_context->swapchain->device == device) + { + target = current_context->current_rt; + } + else + { + struct wined3d_swapchain *swapchain = device->swapchains[0]; + if (swapchain->back_buffers) + target = swapchain->back_buffers[0]; + else + target = swapchain->front_buffer; + } + } + + if (current_context && current_context->current_rt == target) + { + context = current_context; + } + else if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) + { + TRACE("Rendering onscreen.\n"); + + context = swapchain_get_context(target->container.u.swapchain); + } + else + { + TRACE("Rendering offscreen.\n"); + + /* Stay with the current context if possible. Otherwise use the + * context for the primary swapchain. */ + if (current_context && current_context->swapchain->device == device) + context = current_context; + else + context = swapchain_get_context(device->swapchains[0]); + } + + context_update_window(context); context_setup_target(device, context, target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 56428c638650b39fc37b100af1d67acc0f96a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56428c638650b39fc37b100af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:52 2011 +0200 wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e720dd..88e8a1d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3199,6 +3199,8 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, } } +/* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since + * in both cases we're just setting the X / Alpha channel to 0xff. */ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { @@ -3317,6 +3319,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, };

1 0

Henri Verbeet : wined3d: Add compressed surface support to surface_cpu_blt( ).
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 156d24c63466479e72811ce0bddef1d5ec754998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156d24c63466479e72811ce0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:51 2011 +0200 wined3d: Add compressed surface support to surface_cpu_blt(). --- dlls/wined3d/surface.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4afcf66..8e720dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6569,15 +6569,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * wined3d_surface_map(dst_surface, &dlock, NULL, 0); } - if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_FOURCC) - { - if (!dst_rect || src_surface == dst_surface) - { - memcpy(dlock.pBits, slock.pBits, dst_surface->resource.size); - goto release; - } - } - bpp = dst_surface->resource.format->byte_count; srcheight = xsrc.bottom - xsrc.top; srcwidth = xsrc.right - xsrc.left; @@ -6585,6 +6576,40 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; + if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count; + + if (flags || src_surface == dst_surface) + { + FIXME("Only plain blits supported on compressed surfaces.\n"); + hr = E_NOTIMPL; + goto release; + } + + TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); + + if (srcheight != dstheight || srcwidth != dstwidth) + { + WARN("Stretching not supported on compressed surfaces.\n"); + hr = WINED3DERR_INVALIDCALL; + goto release; + } + + dbuf = dlock.pBits; + sbuf = slock.pBits; + + row_block_count = (dstwidth + dst_format->block_width - 1) / dst_format->block_width; + for (y = 0; y < dstheight; y += dst_format->block_height) + { + memcpy(dbuf, sbuf, row_block_count * dst_format->block_byte_count); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + + goto release; + } + if (dst_rect && src_surface != dst_surface) dbuf = dlock.pBits; else

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
77
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 August 2011