Henri Verbeet : wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
Module: wine Branch: master Commit: 9b74ebd79404c867aadb723ffa2ab34b3bf741cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74ebd79404c867aadb723ffa...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Jul 9 23:16:37 2012 +0200
wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
---
dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 8 ++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 12 ++++-------- dlls/wined3d/swapchain.c | 12 ++++-------- include/wine/wined3d.h | 2 +- 6 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 637109f..60849a3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1400,7 +1400,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *
static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); @@ -1409,9 +1409,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr;
FIXME("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p partial stub!\n", + "\tmultisample_quality %u, surface %p partial stub!\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface);
FIXME("Implement DXGI<->wined3d usage conversion\n");
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c135012..31f0eb2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2856,7 +2856,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *
static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); @@ -2864,12 +2864,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr;
TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, - multisample_type, multisample_quality, lockable, surface); + multisample_type, multisample_quality, surface);
hr = IDirect3DDevice8_CreateRenderTarget(&device->IDirect3DDevice8_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, lockable, (IDirect3DSurface8 **)&d3d_surface); + d3dformat_from_wined3dformat(format), multisample_type, TRUE, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { WARN("Failed to create rendertarget, hr %#x.\n", hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04a073d..ef5aa46 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3210,7 +3210,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *
static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); @@ -3218,12 +3218,12 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par HRESULT hr;
TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface);
hr = d3d9_device_CreateRenderTarget(&device->IDirect3DDevice9Ex_iface, width, height, - d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, lockable, + d3dformat_from_wined3dformat(format), multisample_type, multisample_quality, TRUE, (IDirect3DSurface9 **)&d3d_surface, NULL); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d628629..d613d17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5444,17 +5444,16 @@ static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops =
static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, - enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, + enum wined3d_multisample_type multisample_type, DWORD multisample_quality, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - DWORD flags = 0; HRESULT hr;
TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, lockable %u, surface %p.\n", + "\tmultisample_quality %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, - multisample_quality, lockable, surface); + multisample_quality, surface);
if (ddraw->wined3d_frontbuffer) { @@ -5462,12 +5461,9 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par return E_FAIL; }
- if (lockable) - flags |= WINED3D_SURFACE_MAPPABLE; - hr = wined3d_surface_create(ddraw->wined3d_device, width, height, format, 0, WINED3DUSAGE_RENDERTARGET, WINED3D_POOL_DEFAULT, multisample_type, multisample_quality, - DefaultSurfaceType, flags, ddraw, &ddraw_frontbuffer_parent_ops, surface); + DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, surface); if (SUCCEEDED(hr)) ddraw->wined3d_frontbuffer = *surface;
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c69fad..4aeabfb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -943,12 +943,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ swapchain_update_render_to_fbo(swapchain);
TRACE("Creating front buffer.\n"); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->front_buffer); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->front_buffer))) { WARN("Failed to create front buffer, hr %#x.\n", hr); goto err; @@ -1053,12 +1051,10 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, enum wined3d_ for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i); - hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, + if (FAILED(hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, swapchain->desc.backbuffer_width, swapchain->desc.backbuffer_height, swapchain->desc.backbuffer_format, swapchain->desc.multisample_type, - swapchain->desc.multisample_quality, TRUE /* Lockable */, - &swapchain->back_buffers[i]); - if (FAILED(hr)) + swapchain->desc.multisample_quality, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); goto err; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4576937..6709d28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2002,7 +2002,7 @@ struct wined3d_device_parent_ops UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, - DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface); + DWORD multisample_quality, struct wined3d_surface **surface); HRESULT (__cdecl *create_depth_stencil)(struct wined3d_device_parent *device_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface);
-
Alexandre Julliard