April 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Store the depth/ stencil attachment as IWineD3DSurfaceImpl pointer in struct fbo_entry.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: da1b459754d1c90442e884648cac39cb03cd81b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1b459754d1c90442e884648… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:28 2010 +0200 wined3d: Store the depth/stencil attachment as IWineD3DSurfaceImpl pointer in struct fbo_entry. --- dlls/wined3d/context.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d7f6b40..ffb2a8c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -308,7 +308,7 @@ static void context_check_fbo_status(struct wined3d_context *context) attachment->pow2Width, attachment->pow2Height); } } - attachment = (IWineD3DSurfaceImpl *)context->current_fbo->depth_stencil; + attachment = context->current_fbo->depth_stencil; if (attachment) { FIXME("\tDepth attachment: (%p) %s %ux%u\n", @@ -327,7 +327,7 @@ static struct fbo_entry *context_create_fbo_entry(struct wined3d_context *contex entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); entry->render_targets = HeapAlloc(GetProcessHeap(), 0, gl_info->limits.buffers * sizeof(*entry->render_targets)); memcpy(entry->render_targets, device->render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); - entry->depth_stencil = device->stencilBufferTarget; + entry->depth_stencil = (IWineD3DSurfaceImpl *)device->stencilBufferTarget; entry->attached = FALSE; entry->id = 0; @@ -344,7 +344,7 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, struct fbo_ context_clean_fbo_attachments(gl_info); memcpy(entry->render_targets, device->render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); - entry->depth_stencil = device->stencilBufferTarget; + entry->depth_stencil = (IWineD3DSurfaceImpl *)device->stencilBufferTarget; entry->attached = FALSE; } @@ -374,7 +374,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context) { if (!memcmp(entry->render_targets, device->render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)) - && entry->depth_stencil == device->stencilBufferTarget) + && entry->depth_stencil == (IWineD3DSurfaceImpl *)device->stencilBufferTarget) { list_remove(&entry->entry); list_add_head(&context->fbo_list, &entry->entry); @@ -629,7 +629,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { UINT j; - if (entry->depth_stencil == (IWineD3DSurface *)resource) + if (entry->depth_stencil == (IWineD3DSurfaceImpl *)resource) { list_remove(&entry->entry); list_add_head(&context->fbo_destroy_list, &entry->entry); @@ -674,7 +674,7 @@ void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl } } - if (surface == (IWineD3DSurfaceImpl *)entry->depth_stencil) + if (surface == entry->depth_stencil) { TRACE("Updated surface %p is bound as depth attachment to the current FBO.\n", surface); context->rebind_fbo = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a6e3ee..31ed565 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,7 +2023,7 @@ struct fbo_entry { struct list entry; IWineD3DSurfaceImpl **render_targets; - IWineD3DSurface *depth_stencil; + IWineD3DSurfaceImpl *depth_stencil; BOOL attached; GLuint id; };

1 0

Frédéric Delanoy : loader: Fix French translation of wine manpage.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 32ceee8bf1c0a979f57e10279cc132f88ec9fd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ceee8bf1c0a979f57e10279… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 9 01:31:59 2010 +0200 loader: Fix French translation of wine manpage. --- loader/wine.fr.man.in | 146 ++++++++++++++++++++++++------------------------- 1 files changed, 72 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ceee8bf1c0a979f57e1…

1 0

Vincent Povirk : gdiplus: Use a helper function to draw image data from bitmaps in software.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 9c380b1e8e8cf3fb965675285d0bf48c535ac6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c380b1e8e8cf3fb965675285… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 14:11:07 2010 -0500 gdiplus: Use a helper function to draw image data from bitmaps in software. This will make it possible to use the same codepath for non-bitmap graphics objects and to create a software implementation for other drawing operations. --- dlls/gdiplus/graphics.c | 60 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b3f64f..6a1dc10 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -173,6 +173,35 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +/* Draw non-premultiplied ARGB data to the given graphics object */ +static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + if (graphics->image && graphics->image->type == ImageTypeBitmap) + { + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; + + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) + { + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + } + } + + return Ok; + } + else + { + ERR("Not implemented for non-bitmap DC's\n"); + return GenericError; + } +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; @@ -1939,9 +1968,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (use_software) { RECT src_area, dst_area; - int i, x, y; + int i, x, y, stride; GpMatrix *dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; + LPBYTE data; src_area.left = srcx*dx; src_area.top = srcy*dy; @@ -1975,13 +2005,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image return stat; } + data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); + if (!data) + { + GdipDeleteMatrix(dst_to_src); + return OutOfMemory; + } + + stride = sizeof(ARGB) * (dst_area.right - dst_area.left); + for (x=dst_area.left; x<dst_area.right; x++) { for (y=dst_area.top; y<dst_area.bottom; y++) { GpPointF src_pointf; int src_x, src_y; - ARGB src_color, dst_color; + ARGB *src_color; src_pointf.X = x; src_pointf.Y = y; @@ -1991,18 +2030,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_x = roundr(src_pointf.X); src_y = roundr(src_pointf.Y); + src_color = (ARGB*)(data + stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); + if (src_x < src_area.left || src_x >= src_area.right || src_y < src_area.top || src_y >= src_area.bottom) /* FIXME: Use wrapmode */ - continue; - - GdipBitmapGetPixel(bitmap, src_x, src_y, &src_color); - GdipBitmapGetPixel((GpBitmap*)graphics->image, x, y, &dst_color); - GdipBitmapSetPixel((GpBitmap*)graphics->image, x, y, color_over(dst_color, src_color)); + *src_color = 0; + else + GdipBitmapGetPixel(bitmap, src_x, src_y, src_color); } } GdipDeleteMatrix(dst_to_src); + + stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, + data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, stride); + + GdipFree(data); + + return stat; } else {

1 0

Vincent Povirk : gdiplus: Correct the coordinate transform for non-rectangular parallelograms.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: bb9c1878c3aeb2b0ee17b57be23c07b661ade45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9c1878c3aeb2b0ee17b57be… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 15:13:34 2010 -0500 gdiplus: Correct the coordinate transform for non-rectangular parallelograms. Apparently matrices in gdiplus don't work the way I think they do. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5a75fd0..b0cba47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2030,11 +2030,11 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } m11 = (ptf[1].X - ptf[0].X) / srcwidth; - m12 = (ptf[2].X - ptf[0].X) / srcheight; - mdx = ptf[0].X - m11 * srcx - m12 * srcy; - m21 = (ptf[1].Y - ptf[0].Y) / srcwidth; + m21 = (ptf[2].X - ptf[0].X) / srcheight; + mdx = ptf[0].X - m11 * srcx - m21 * srcy; + m12 = (ptf[1].Y - ptf[0].Y) / srcwidth; m22 = (ptf[2].Y - ptf[0].Y) / srcheight; - mdy = ptf[0].Y - m21 * srcx - m22 * srcy; + mdy = ptf[0].Y - m12 * srcx - m22 * srcy; stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); if (stat != Ok) return stat;

1 0

Henri Verbeet : wined3d: Remove some dead code from IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: f6e923b55d63dd5f8c14238668378884c713fdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e923b55d63dd5f8c1423866… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:29 2010 +0200 wined3d: Remove some dead code from IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3d6a6e..2b4e526 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1862,9 +1862,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, This->stencilBufferTarget = NULL; TRACE("Releasing the render target at %p\n", This->render_targets[0]); - if(IWineD3DSurface_Release(This->render_targets[0]) >0){ - /* This check is a bit silly, it should be in swapchain_release FIXME("(%p) Something's still holding the renderTarget\n",This); */ - } + IWineD3DSurface_Release(This->render_targets[0]); + TRACE("Setting rendertarget to NULL\n"); This->render_targets[0] = NULL;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_attach_surface_fbo() .
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 95130a7d5eaf4ddae7a916e83258590123899b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95130a7d5eaf4ddae7a916e83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:25 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_attach_surface_fbo(). --- dlls/wined3d/context.c | 15 +++++++-------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe6cd1f..e98eecb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -255,20 +255,19 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, /* GL locking is done by the caller */ void context_attach_surface_fbo(const struct wined3d_context *context, - GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) + GLenum fbo_target, DWORD idx, IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Attach surface %p to %u\n", surface, idx); if (surface) { - surface_prepare_texture(surface_impl, gl_info, FALSE); - context_apply_attachment_filter_states(surface_impl); + surface_prepare_texture(surface, gl_info, FALSE); + context_apply_attachment_filter_states(surface); - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface_impl->texture_target, - surface_impl->texture_name, surface_impl->texture_level); + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface->texture_target, + surface->texture_name, surface->texture_level); checkGLcall("glFramebufferTexture2D()"); } else @@ -415,7 +414,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - IWineD3DSurface *render_target = device->render_targets[i]; + IWineD3DSurfaceImpl *render_target = (IWineD3DSurfaceImpl *)device->render_targets[i]; context_attach_surface_fbo(context, GL_FRAMEBUFFER, i, render_target); } @@ -2011,7 +2010,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)context->current_rt); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); LEAVE_GL(); } else { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 986d042..c3d6a6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4394,7 +4394,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurface *)target); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, target); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); LEAVE_GL(); } @@ -5458,7 +5458,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, surface); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)surface); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); } @@ -5784,7 +5784,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const TRACE("Source surface %p is offscreen\n", src_surface); ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, src_surface); + context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)src_surface); glReadBuffer(GL_COLOR_ATTACHMENT0); checkGLcall("glReadBuffer()"); context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); @@ -5823,7 +5823,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, dst_surface); + context_attach_surface_fbo(context, GL_DRAW_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)dst_surface); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); context_attach_depth_stencil_fbo(context, GL_DRAW_FRAMEBUFFER, NULL, FALSE); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9929037..8c78fac 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -118,7 +118,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * { ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); - context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, This->backBuffer[0]); + context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, backbuffer); context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc57762..7a86d4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1216,7 +1216,7 @@ void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fb void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context, - GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) DECLSPEC_HIDDEN; + GLenum fbo_target, DWORD idx, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target, const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN; void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_attach_depth_stencil_fbo ().
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 24c93d48aab845b20b20bc234d190a313a433ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c93d48aab845b20b20bc234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:26 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_attach_depth_stencil_fbo(). --- dlls/wined3d/context.c | 25 ++++++++++++------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e98eecb..43a6d8a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -182,51 +182,50 @@ static void context_apply_attachment_filter_states(IWineD3DSurfaceImpl *surface) /* GL locking is done by the caller */ void context_attach_depth_stencil_fbo(struct wined3d_context *context, - GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) + GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) { - IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Attach depth stencil %p\n", depth_stencil); if (depth_stencil) { - DWORD format_flags = depth_stencil_impl->resource.format_desc->Flags; + DWORD format_flags = depth_stencil->resource.format_desc->Flags; - if (use_render_buffer && depth_stencil_impl->current_renderbuffer) + if (use_render_buffer && depth_stencil->current_renderbuffer) { if (format_flags & WINED3DFMT_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, - GL_RENDERBUFFER, depth_stencil_impl->current_renderbuffer->id); + GL_RENDERBUFFER, depth_stencil->current_renderbuffer->id); checkGLcall("glFramebufferRenderbuffer()"); } if (format_flags & WINED3DFMT_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, - GL_RENDERBUFFER, depth_stencil_impl->current_renderbuffer->id); + GL_RENDERBUFFER, depth_stencil->current_renderbuffer->id); checkGLcall("glFramebufferRenderbuffer()"); } } else { - surface_prepare_texture(depth_stencil_impl, gl_info, FALSE); - context_apply_attachment_filter_states(depth_stencil_impl); + surface_prepare_texture(depth_stencil, gl_info, FALSE); + context_apply_attachment_filter_states(depth_stencil); if (format_flags & WINED3DFMT_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, - depth_stencil_impl->texture_target, depth_stencil_impl->texture_name, - depth_stencil_impl->texture_level); + depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_level); checkGLcall("glFramebufferTexture2D()"); } if (format_flags & WINED3DFMT_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, - depth_stencil_impl->texture_target, depth_stencil_impl->texture_name, - depth_stencil_impl->texture_level); + depth_stencil->texture_target, depth_stencil->texture_name, + depth_stencil->texture_level); checkGLcall("glFramebufferTexture2D()"); } } @@ -426,7 +425,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ surface_set_compatible_renderbuffer(device->stencilBufferTarget, w, h); } - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, device->stencilBufferTarget, TRUE); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, (IWineD3DSurfaceImpl *)device->stencilBufferTarget, TRUE); entry->attached = TRUE; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ac29c8..c3f09d4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4140,7 +4140,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *co gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, device->depth_blt_rb); checkGLcall("glFramebufferRenderbufferEXT"); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, iface, FALSE); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, This, FALSE); /* Do the actual blit */ surface_depth_blt(This, gl_info, device->depth_blt_texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a86d4c..95445a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1214,7 +1214,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, - GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; + GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; void context_attach_surface_fbo(const struct wined3d_context *context, GLenum fbo_target, DWORD idx, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_apply_attachment_filter_states ().
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 870b3cb40b7ddeb714c7eb0a1dd0e121a4db3774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870b3cb40b7ddeb714c7eb0a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:24 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_apply_attachment_filter_states(). --- dlls/wined3d/context.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e218088..fe6cd1f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -114,15 +114,15 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) } /* GL locking is done by the caller */ -static void context_apply_attachment_filter_states(IWineD3DSurface *surface) +static void context_apply_attachment_filter_states(IWineD3DSurfaceImpl *surface) { IWineD3DBaseTextureImpl *texture_impl; /* Update base texture states array */ - if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { - IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; - IWineD3DDeviceImpl *device = surface_impl->resource.device; + IWineD3DDeviceImpl *device = surface->resource.device; BOOL update_minfilter = FALSE; BOOL update_magfilter = FALSE; @@ -153,7 +153,7 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) GLenum target, bind_target; GLint old_binding; - target = surface_impl->texture_target; + target = surface->texture_target; if (target == GL_TEXTURE_2D) { bind_target = GL_TEXTURE_2D; @@ -170,7 +170,7 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); } - glBindTexture(bind_target, surface_impl->texture_name); + glBindTexture(bind_target, surface->texture_name); if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glBindTexture(bind_target, old_binding); @@ -212,7 +212,7 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { surface_prepare_texture(depth_stencil_impl, gl_info, FALSE); - context_apply_attachment_filter_states(depth_stencil); + context_apply_attachment_filter_states(depth_stencil_impl); if (format_flags & WINED3DFMT_FLAG_DEPTH) { @@ -265,7 +265,7 @@ void context_attach_surface_fbo(const struct wined3d_context *context, if (surface) { surface_prepare_texture(surface_impl, gl_info, FALSE); - context_apply_attachment_filter_states(surface); + context_apply_attachment_filter_states(surface_impl); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, surface_impl->texture_target, surface_impl->texture_name, surface_impl->texture_level); @@ -436,10 +436,10 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ for (i = 0; i < gl_info->limits.buffers; ++i) { if (device->render_targets[i]) - context_apply_attachment_filter_states(device->render_targets[i]); + context_apply_attachment_filter_states((IWineD3DSurfaceImpl *)device->render_targets[i]); } if (device->stencilBufferTarget) - context_apply_attachment_filter_states(device->stencilBufferTarget); + context_apply_attachment_filter_states((IWineD3DSurfaceImpl *)device->stencilBufferTarget); } for (i = 0; i < gl_info->limits.buffers; ++i)

1 0

Henri Verbeet : wined3d: Get rid of glRect from IWineD3DSurfaceImpl.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: 65797d7f75f6a740e3ede64bccec04520499c620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65797d7f75f6a740e3ede64bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:20 2010 +0200 wined3d: Get rid of glRect from IWineD3DSurfaceImpl. 604caf0caae888c5765198416e9b5640a9e64efa supposedly removed the "oversized texture" code, but this was still left over. --- dlls/wined3d/device.c | 4 ---- dlls/wined3d/surface.c | 34 +++++++--------------------------- dlls/wined3d/swapchain.c | 4 ---- dlls/wined3d/wined3d_private.h | 3 --- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91e595c..986d042 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6196,10 +6196,6 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES while (surface->pow2Width < pPresentationParameters->BackBufferWidth) surface->pow2Width <<= 1; while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } - surface->glRect.left = 0; - surface->glRect.top = 0; - surface->glRect.right = surface->pow2Width; - surface->glRect.bottom = surface->pow2Height; if (surface->texture_name) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc24bb4..177001e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1560,7 +1560,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) { DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - GLsizei width, height; CONVERT_TYPES convert; struct wined3d_format_desc desc; @@ -1570,19 +1569,9 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; else surface->Flags &= ~SFLAG_CONVERTED; - if (surface->Flags & SFLAG_NONPOW2) - { - width = surface->pow2Width; - height = surface->pow2Height; - } - else - { - width = surface->glRect.right - surface->glRect.left; - height = surface->glRect.bottom - surface->glRect.top; - } - surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, srgb, width, height); + surface_allocate_surface(surface, gl_info, &desc, srgb, + surface->pow2Width, surface->pow2Height); surface->Flags |= alloc_flag; } @@ -3981,13 +3970,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { /* We should never use this surface in combination with OpenGL! */ TRACE("(%p) Creating an oversized surface: %ux%u\n", This, This->pow2Width, This->pow2Height); - - /* This will be initialized on the first blt */ - This->glRect.left = 0; - This->glRect.top = 0; - This->glRect.right = 0; - This->glRect.bottom = 0; - } else { + } + else + { /* Don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE doesn't work in combination with ARB_TEXTURE_RECTANGLE. @@ -4002,11 +3987,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->pow2Height = This->currentDesc.Height; This->Flags &= ~(SFLAG_NONPOW2 | SFLAG_NORMCOORD); } - - This->glRect.left = 0; - This->glRect.top = 0; - This->glRect.right = This->pow2Width; - This->glRect.bottom = This->pow2Height; } if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { @@ -4548,8 +4528,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D */ if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, srgb, This->glRect.right - This->glRect.left, - This->glRect.bottom - This->glRect.top, mem); + surface_upload_data(This, gl_info, &desc, srgb, + This->pow2Width, This->pow2Height, mem); } } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1265abc..9929037 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -256,10 +256,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO cursor.texture_level = 0; cursor.currentDesc.Width = This->device->cursorWidth; cursor.currentDesc.Height = This->device->cursorHeight; - cursor.glRect.left = 0; - cursor.glRect.top = 0; - cursor.glRect.right = cursor.currentDesc.Width; - cursor.glRect.bottom = cursor.currentDesc.Height; /* The cursor must have pow2 sizes */ cursor.pow2Width = cursor.currentDesc.Width; cursor.pow2Height = cursor.currentDesc.Height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4652be5..dc57762 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2065,9 +2065,6 @@ struct IWineD3DSurfaceImpl /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ void (*get_drawable_size)(struct wined3d_context *context, UINT *width, UINT *height); - /* Oversized texture */ - RECT glRect; - /* PBO */ GLuint pbo; GLuint texture_name;

1 0

Alexandre Julliard : winex11: Mask out the alpha channel when converting from color to monochrome.
by Alexandre Julliard April 16, 2010

April 16, 2010

Module: wine Branch: master Commit: da57adf2711f7cde8e2a8ea326f73222583d7129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da57adf2711f7cde8e2a8ea32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 22:53:27 2010 +0200 winex11: Mask out the alpha channel when converting from color to monochrome. --- dlls/winex11.drv/bitblt.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c9aa7cf..94620df 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -552,6 +552,21 @@ static void get_colors(X11DRV_PDEVICE *physDevDst, X11DRV_PDEVICE *physDevSrc, } } +/* return a mask for meaningful bits when doing an XGetPixel on an image */ +static unsigned long image_pixel_mask( X11DRV_PDEVICE *physDev ) +{ + unsigned long ret; + ColorShifts *shifts = physDev->color_shifts; + + if (!shifts) shifts = &X11DRV_PALETTE_default_shifts; + ret = (shifts->physicalRed.max << shifts->physicalRed.shift) | + (shifts->physicalGreen.max << shifts->physicalGreen.shift) | + (shifts->physicalBlue.max << shifts->physicalBlue.shift); + if (!ret) ret = (1 << physDev->depth) - 1; + return ret; +} + + /*********************************************************************** * BITBLT_StretchRow * @@ -617,7 +632,7 @@ static void BITBLT_ShrinkRow( int *rowSrc, int *rowDst, */ static void BITBLT_GetRow( XImage *image, int *pdata, INT row, INT start, INT width, INT depthDst, - int fg, int bg, BOOL swap) + int fg, int bg, unsigned long pixel_mask, BOOL swap) { register INT i; @@ -655,9 +670,9 @@ static void BITBLT_GetRow( XImage *image, int *pdata, INT row, else /* color -> monochrome */ { if (swap) for (i = 0; i < width; i++) - *pdata-- = (XGetPixel( image, i, row ) == bg) ? 1 : 0; + *pdata-- = ((XGetPixel( image, i, row ) & pixel_mask) == bg) ? 1 : 0; else for (i = 0; i < width; i++) - *pdata++ = (XGetPixel( image, i, row ) == bg) ? 1 : 0; + *pdata++ = ((XGetPixel( image, i, row ) & pixel_mask) == bg) ? 1 : 0; } } } @@ -673,7 +688,8 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, INT widthSrc, INT heightSrc, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst, - int foreground, int background, WORD mode ) + int foreground, int background, + unsigned long pixel_mask, WORD mode ) { int *rowSrc, *rowDst, *pixel; char *pdata; @@ -740,7 +756,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, hswap ? widthSrc - visRectSrc->right : visRectSrc->left, visRectSrc->right - visRectSrc->left, - dstImage->depth, foreground, background, hswap ); + dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ if (hstretch) @@ -799,7 +815,7 @@ static void BITBLT_StretchImage( XImage *srcImage, XImage *dstImage, hswap ? widthSrc - visRectSrc->right : visRectSrc->left, visRectSrc->right - visRectSrc->left, - dstImage->depth, foreground, background, hswap ); + dstImage->depth, foreground, background, pixel_mask, hswap ); /* Stretch or shrink it */ if (hstretch) @@ -901,9 +917,8 @@ static int BITBLT_GetSrcAreaStretch( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE rectDst.bottom - rectDst.top, physDevDst->depth ); BITBLT_StretchImage( imageSrc, imageDst, src->width, src->height, dst->width, dst->height, &rectSrc, &rectDst, - fg, physDevDst->depth != 1 ? - bg : physDevSrc->backgroundPixel, - GetStretchBltMode(physDevDst->hdc) ); + fg, physDevDst->depth != 1 ? bg : physDevSrc->backgroundPixel, + image_pixel_mask( physDevSrc ), GetStretchBltMode(physDevDst->hdc) ); wine_tsx11_lock(); XPutImage( gdi_display, pixmap, gc, imageDst, 0, 0, 0, 0, rectDst.right - rectDst.left, rectDst.bottom - rectDst.top ); @@ -1013,6 +1028,7 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe } else /* color -> monochrome */ { + unsigned long pixel_mask; wine_tsx11_lock(); /* FIXME: avoid BadMatch error */ imageSrc = XGetImage( gdi_display, physDevSrc->drawable, @@ -1031,10 +1047,11 @@ static int BITBLT_GetSrcArea( X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDe wine_tsx11_unlock(); return exposures; } + pixel_mask = image_pixel_mask( physDevSrc ); for (y = 0; y < height; y++) for (x = 0; x < width; x++) - XPutPixel(imageDst, x, y, (XGetPixel(imageSrc,x,y) == - physDevSrc->backgroundPixel) ); + XPutPixel(imageDst, x, y, + !((XGetPixel(imageSrc,x,y) ^ physDevSrc->backgroundPixel) & pixel_mask)); XPutImage( gdi_display, pixmap, gc, imageDst, 0, 0, 0, 0, width, height ); XDestroyImage( imageSrc );

1 0