wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Frédéric Delanoy : loader: Fix French translation of wine manpage.
by Alexandre Julliard 16 Apr '10

16 Apr '10

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 UnitPixel for metafile bounds when creating from HMETAFILE.
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: 2f9c6091fcecdb7a249b54e3966935e887280b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9c6091fcecdb7a249b54e39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 15 13:32:44 2010 -0500 gdiplus: Use UnitPixel for metafile bounds when creating from HMETAFILE. --- dlls/gdiplus/graphics.c | 6 +++--- dlls/gdiplus/tests/image.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7510fa0..7b3f64f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1273,10 +1273,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Top) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right - - placeable->BoundingBox.Left)) / ((REAL) placeable->Inch); + - placeable->BoundingBox.Left)); (*metafile)->bounds.Height = ((REAL) (placeable->BoundingBox.Bottom - - placeable->BoundingBox.Top)) / ((REAL) placeable->Inch); - (*metafile)->unit = UnitInch; + - placeable->BoundingBox.Top)); + (*metafile)->unit = UnitPixel; if(delete) DeleteMetaFile(hwmf); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0ca22e5..fdfd2b2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -942,11 +942,11 @@ static void test_createfromwmf(void) stat = GdipGetImageBounds(img, &bounds, &unit); expect(Ok, stat); - todo_wine expect(UnitPixel, unit); + expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - todo_wine expectf(320.0, bounds.Width); - todo_wine expectf(320.0, bounds.Height); + expectf(320.0, bounds.Width); + expectf(320.0, bounds.Height); stat = GdipGetImageHorizontalResolution(img, &res); expect(Ok, stat);

1 0

Henri Verbeet : wined3d: Remove some dead code from IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 16 Apr '10

16 Apr '10

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: Store the depth/ stencil attachment as IWineD3DSurfaceImpl pointer in struct fbo_entry.
by Alexandre Julliard 16 Apr '10

16 Apr '10

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

Henri Verbeet : wined3d: Store render target attachments as IWineD3DSurfaceImpl pointers in struct fbo_entry .
by Alexandre Julliard 16 Apr '10

16 Apr '10

Module: wine Branch: master Commit: be993fc49fb739dfb7154e065e177d058392d514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be993fc49fb739dfb7154e065… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 19:21:27 2010 +0200 wined3d: Store render target attachments as IWineD3DSurfaceImpl pointers in struct fbo_entry. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 43a6d8a..d7f6b40 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -300,7 +300,7 @@ static void context_check_fbo_status(struct wined3d_context *context) /* Dump the FBO attachments */ for (i = 0; i < gl_info->limits.buffers; ++i) { - attachment = (IWineD3DSurfaceImpl *)context->current_fbo->render_targets[i]; + attachment = context->current_fbo->render_targets[i]; if (attachment) { FIXME("\tColor attachment %d: (%p) %s %ux%u\n", @@ -638,7 +638,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource for (j = 0; j < gl_info->limits.buffers; ++j) { - if (entry->render_targets[j] == (IWineD3DSurface *)resource) + if (entry->render_targets[j] == (IWineD3DSurfaceImpl *)resource) { list_remove(&entry->entry); list_add_head(&context->fbo_destroy_list, &entry->entry); @@ -666,7 +666,7 @@ void context_surface_update(struct wined3d_context *context, IWineD3DSurfaceImpl for (i = 0; i < gl_info->limits.buffers; ++i) { - if (surface == (IWineD3DSurfaceImpl *)entry->render_targets[i]) + if (surface == entry->render_targets[i]) { TRACE("Updated surface %p is bound as color attachment %u to the current FBO.\n", surface, i); context->rebind_fbo = TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95445a1..2a6e3ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2022,7 +2022,7 @@ typedef struct { struct fbo_entry { struct list entry; - IWineD3DSurface **render_targets; + IWineD3DSurfaceImpl **render_targets; IWineD3DSurface *depth_stencil; BOOL attached; GLuint id;

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

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_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: 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: 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

← Newer
1
...
43
44
45
46
47
48
49
...
90
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 April 2010