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

Vincent Povirk : gdiplus: Do not create FontFamilies for bitmap fonts.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 531219f84d0d6fa236283e5c3d061b5f752df793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531219f84d0d6fa236283e5c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 11:49:20 2010 -0500 gdiplus: Do not create FontFamilies for bitmap fonts. --- dlls/gdiplus/font.c | 5 ++++- dlls/gdiplus/tests/font.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0b7f9f6..3a29771 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -521,7 +521,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - if (!ntm) + if (!ntm || type == RASTER_FONTTYPE) { return 1; } @@ -966,6 +966,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontCollection* fonts = (GpFontCollection*)lParam; int i; + if (type == RASTER_FONTTYPE) + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1bf2c1e..80f11bc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -192,12 +192,9 @@ static void test_fontfamily (void) expect (FontFamilyNotFound, stat); /* Bitmap fonts are not found */ -todo_wine -{ stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); expect (FontFamilyNotFound, stat); if(stat == Ok) GdipDeleteFontFamily(family); -} stat = GdipCreateFontFamilyFromName (arial, NULL, &family); if(stat == FontFamilyNotFound)

1 0

Henri Verbeet : wined3d: Get rid of glRect from IWineD3DSurfaceImpl.
by Alexandre Julliard 16 Apr '10

16 Apr '10

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

Henri Verbeet : wined3d: The currentDesc and pow2 width/ height are the same for power of two textures.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 7f6ab3c06e921074c6944eda8b3dd9863fe6e49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6ab3c06e921074c6944eda8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:21 2010 +0200 wined3d: The currentDesc and pow2 width/height are the same for power of two textures. --- dlls/wined3d/surface.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 177001e..182e219 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4515,22 +4515,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D glPixelStorei(GL_UNPACK_ROW_LENGTH, width); LEAVE_GL(); - if (This->Flags & SFLAG_NONPOW2) { - TRACE("non power of two support\n"); - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->currentDesc.Width, This->currentDesc.Height, mem); - } - } else { - /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory - * changed. So also keep track of memory changes. In this case the texture has to be reallocated - */ - if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->pow2Width, This->pow2Height, mem); - } + if (mem || (This->Flags & SFLAG_PBO)) + { + surface_upload_data(This, gl_info, &desc, srgb, + This->currentDesc.Width, This->currentDesc.Height, mem); } /* Restore the default pitch */

1 0

Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_allocate_surface().
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 212bfab2dfb586f5563a9fe95cfee6112ee18219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212bfab2dfb586f5563a9fe95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:22 2010 +0200 wined3d: Get rid of the width and height parameters to surface_allocate_surface(). --- dlls/wined3d/surface.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 182e219..7c95530 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -797,9 +797,11 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ * the correct texture. */ /* Context activation is done by the caller. */ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height) + const struct wined3d_format_desc *format_desc, BOOL srgb) { BOOL enable_client_storage = FALSE; + GLsizei width = This->pow2Width; + GLsizei height = This->pow2Height; const BYTE *mem = NULL; GLenum internal; @@ -1531,7 +1533,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb); This->Flags |= alloc_flag; } @@ -1570,8 +1572,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ else surface->Flags &= ~SFLAG_CONVERTED; surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, srgb, - surface->pow2Width, surface->pow2Height); + surface_allocate_surface(surface, gl_info, &desc, srgb); surface->Flags |= alloc_flag; }

1 0

Henri Verbeet : wined3d: Get rid of the width and height parameters to surface_upload_data().
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: bc2850a587088eca16e55dbf2c0c587aedae6907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2850a587088eca16e55dbf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:23 2010 +0200 wined3d: Get rid of the width and height parameters to surface_upload_data(). --- dlls/wined3d/surface.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7c95530..0ac29c8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -720,8 +720,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3 * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height, const GLvoid *data) + const struct wined3d_format_desc *format_desc, BOOL srgb, const GLvoid *data) { + GLsizei width = This->currentDesc.Width; + GLsizei height = This->currentDesc.Height; GLenum internal; if (srgb) @@ -4517,10 +4519,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D LEAVE_GL(); if (mem || (This->Flags & SFLAG_PBO)) - { - surface_upload_data(This, gl_info, &desc, srgb, - This->currentDesc.Width, This->currentDesc.Height, mem); - } + surface_upload_data(This, gl_info, &desc, srgb, mem); /* Restore the default pitch */ ENTER_GL();

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to context_apply_attachment_filter_states ().
by Alexandre Julliard 16 Apr '10

16 Apr '10

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: Simply pass an IWineD3DSurfaceImpl pointer to context_attach_surface_fbo() .
by Alexandre Julliard 16 Apr '10

16 Apr '10

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 16 Apr '10

16 Apr '10

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

Aric Stewart : usp10/tests: Expanded tests for ScriptShape.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d4b853695276be6d1492a909a263bcc7ce4ca828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b853695276be6d1492a909a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 15 09:23:04 2010 -0500 usp10/tests: Expanded tests for ScriptShape. --- dlls/usp10/tests/usp10.c | 125 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1a9301b..b7f3d2f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -289,16 +289,14 @@ static void test_ScriptItemize( void ) static void test_ScriptShape(HDC hdc) { - static const WCHAR test1[] = {'t', 'e', 's', 't',0}; - BOOL ret; + static const WCHAR test1[] = {'w', 'i', 'n', 'e',0}; + static const WCHAR test2[] = {0x202B, 'i', 'n', 0x202C,0}; HRESULT hr; SCRIPT_CACHE sc = NULL; - WORD glyphs[4], logclust[4]; + WORD glyphs[4], glyphs2[4], logclust[4]; SCRIPT_VISATTR attrs[4]; SCRIPT_ITEM items[2]; - int nb, widths[4]; - GOFFSET offset[4]; - ABC abc[4]; + int nb; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); @@ -324,8 +322,122 @@ static void test_ScriptShape(HDC hdc) ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + memset(glyphs,-1,sizeof(glyphs)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); + sc = NULL; + + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n"); + ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n"); + ok(logclust[0] == 0, "clusters out of order\n"); + ok(logclust[1] == 1, "clusters out of order\n"); + ok(logclust[2] == 2, "clusters out of order\n"); + ok(logclust[3] == 3, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + /* modify LTR to RTL */ + items[0].a.fRTL = 1; + memset(glyphs2,-1,sizeof(glyphs2)); + memset(logclust,-1,sizeof(logclust)); + memset(attrs,-1,sizeof(attrs)); + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(nb == 4, "Wrong number of items\n"); + ok(glyphs2[0] == glyphs[3], "Glyphs not reordered properly\n"); + ok(glyphs2[1] == glyphs[2], "Glyphs not reordered properly\n"); + ok(glyphs2[2] == glyphs[1], "Glyphs not reordered properly\n"); + ok(glyphs2[3] == glyphs[0], "Glyphs not reordered properly\n"); + ok(logclust[0] == 3, "clusters out of order\n"); + ok(logclust[1] == 2, "clusters out of order\n"); + ok(logclust[2] == 1, "clusters out of order\n"); + ok(logclust[3] == 0, "clusters out of order\n"); + ok(attrs[0].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n"); + ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n"); + ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n"); + ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n"); + ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n"); + + ScriptFreeCache(&sc); +} + +static void test_ScriptPlace(HDC hdc) +{ + static const WCHAR test1[] = {'t', 'e', 's', 't',0}; + BOOL ret; + HRESULT hr; + SCRIPT_CACHE sc = NULL; + WORD glyphs[4], logclust[4]; + SCRIPT_VISATTR attrs[4]; + SCRIPT_ITEM items[2]; + int nb, widths[4]; + GOFFSET offset[4]; + ABC abc[4]; + + hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); @@ -1667,6 +1779,7 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); test_ScriptShape(hdc); + test_ScriptPlace(hdc); test_ScriptGetFontProperties(hdc); test_ScriptTextOut(hdc);

1 0

Roderick Colenbrander : wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 2a949ec323aac6f1826148ef97ab6ad992bfc9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a949ec323aac6f1826148ef9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:58 2010 +0200 wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture. --- dlls/wined3d/surface.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e3cef9..2986bc0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1487,13 +1487,9 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_format_desc desc; - CONVERT_TYPES convert; GLint prevRead; BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert); - /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any * states in the stateblock, and no driver was found yet that had bugs in that regard. @@ -1535,7 +1531,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, &desc, srgb, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height); This->Flags |= alloc_flag; }

1 0