Wine-commits

Download

wine-commits@list.winehq.org

December 2013

3 participants
462 discussions

Henri Verbeet : wined3d: Properly check for the front buffer in d3dfmt_get_conv().
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: 7052c87358ee3d54fc07cd4ae26f9cc21c530323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7052c87358ee3d54fc07cd4ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:34 2013 +0100 wined3d: Properly check for the front buffer in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac168dd..ccf6249 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1823,7 +1823,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!((blit_supported && device->fb.render_targets && surface == device->fb.render_targets[0])) + if (!((blit_supported && surface->swapchain && surface == surface->swapchain->front_buffer)) || colorkey_active || !use_texturing) { format->glFormat = GL_RGBA;

1 0

Henri Verbeet : ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create( ).
by Alexandre Julliard 02 Dec '13

02 Dec '13

Module: wine Branch: master Commit: d56b7c20160fbaaecf36ce1e4279a82576000f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56b7c20160fbaaecf36ce1e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 2 12:07:35 2013 +0100 ddraw: Use hr_ddraw_from_wined3d() in ddraw_surface_create(). --- dlls/ddraw/surface.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e94876f..29385b7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5698,7 +5698,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to get display mode, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } /* No pixelformat given? Use the current screen format. */ @@ -5757,7 +5757,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { ERR("Failed to reset device.\n"); HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } } } @@ -5906,18 +5906,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); - switch (hr) - { - case WINED3DERR_INVALIDCALL: - hr = DDERR_INVALIDPARAMS; - break; - - default: - FIXME("Unexpected wined3d error %#x.\n", hr); - break; - } HeapFree(GetProcessHeap(), 0, texture); - return hr; + return hr_ddraw_from_wined3d(hr); } resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); @@ -6006,6 +5996,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) { HeapFree(GetProcessHeap(), 0, texture); + hr = hr_ddraw_from_wined3d(hr); goto fail; }

1 0

Jump to page: