From: Riccardo Bortolato Subject: [PATCH 03/12] ddraw: rename ddraw_surface member wined3d_texture to wined3d_root_texture Message-Id: <1442996856-32611-3-git-send-email-rikyz619@gmail.com> Date: Wed, 23 Sep 2015 10:27:27 +0200 --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 50 +++++++++++++++++++++++----------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bb0a3f8..62bdf85 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -160,7 +160,7 @@ struct ddraw_surface /* Connections to other Objects */ struct ddraw *ddraw; struct wined3d_surface *wined3d_surface; - struct wined3d_texture *wined3d_texture; + struct wined3d_texture *wined3d_root_texture; struct wined3d_rendertarget_view *wined3d_rtv; struct wined3d_private_store private_store; struct d3d_device *device1; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 408eb24..5df2123 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4670,7 +4670,7 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) - wined3d_texture = surf->wined3d_texture; + wined3d_texture = surf->wined3d_root_texture; wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6b6ddb9..bc82320 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -328,8 +328,8 @@ static void ddraw_surface_add_iface(struct ddraw_surface *surface) wined3d_rendertarget_view_incref(surface->wined3d_rtv); if (surface->wined3d_surface) wined3d_surface_incref(surface->wined3d_surface); - if (surface->wined3d_texture) - wined3d_texture_incref(surface->wined3d_texture); + if (surface->wined3d_root_texture) + wined3d_texture_incref(surface->wined3d_root_texture); wined3d_mutex_unlock(); } } @@ -532,8 +532,8 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); - if (surface->wined3d_texture) - wined3d_texture_decref(surface->wined3d_texture); + if (surface->wined3d_root_texture) + wined3d_texture_decref(surface->wined3d_root_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); } @@ -1235,9 +1235,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); tmp = dst_impl->wined3d_surface; - texture = dst_impl->wined3d_texture; + texture = dst_impl->wined3d_root_texture; rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); - ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_root_texture); if (src_impl) { @@ -1265,9 +1265,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); - dst_impl->wined3d_texture = src_impl->wined3d_texture; + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_root_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_root_texture), ddraw_texture); + dst_impl->wined3d_root_texture = src_impl->wined3d_root_texture; ddraw_texture = prev_ddraw_texture; } else @@ -1295,10 +1295,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_root_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_root_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; - dst_impl->wined3d_texture = src_impl->wined3d_texture; + dst_impl->wined3d_root_texture = src_impl->wined3d_root_texture; dst_impl = src_impl; } } @@ -1312,7 +1312,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_resource_set_parent(wined3d_surface_get_resource(tmp), src_impl); src_impl->wined3d_surface = tmp; wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); - src_impl->wined3d_texture = texture; + src_impl->wined3d_root_texture = texture; if (flags) { @@ -2340,7 +2340,7 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO } else { - resource = wined3d_texture_get_resource(surface->wined3d_texture); + resource = wined3d_texture_get_resource(surface->wined3d_root_texture); wined3d_resource_set_priority(resource, priority); hr = DD_OK; } @@ -2364,14 +2364,14 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_root_texture) { WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; } else { - resource = wined3d_texture_get_resource(surface->wined3d_texture); + resource = wined3d_texture_get_resource(surface->wined3d_root_texture); *priority = wined3d_resource_get_priority(resource); hr = DD_OK; } @@ -4029,14 +4029,14 @@ static HRESULT WINAPI ddraw_surface7_SetLOD(IDirectDrawSurface7 *iface, DWORD Ma return DDERR_INVALIDOBJECT; } - if (!surface->wined3d_texture) + if (!surface->wined3d_root_texture) { ERR("The ddraw surface has no wined3d texture.\n"); wined3d_mutex_unlock(); return DDERR_INVALIDOBJECT; } - hr = wined3d_texture_set_lod(surface->wined3d_texture, MaxLOD); + hr = wined3d_texture_set_lod(surface->wined3d_root_texture, MaxLOD); wined3d_mutex_unlock(); return hr; @@ -4072,7 +4072,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M return DDERR_INVALIDOBJECT; } - *MaxLOD = wined3d_texture_get_lod(surface->wined3d_texture); + *MaxLOD = wined3d_texture_get_lod(surface->wined3d_root_texture); wined3d_mutex_unlock(); return DD_OK; @@ -4519,7 +4519,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } - if (FAILED(hr = wined3d_texture_update_desc(This->wined3d_texture, width, height, + if (FAILED(hr = wined3d_texture_update_desc(This->wined3d_root_texture, width, height, format_id, WINED3D_MULTISAMPLE_NONE, 0, DDSD->lpSurface, pitch))) { WARN("Failed to update surface desc, hr %#x.\n", hr); @@ -4706,8 +4706,8 @@ static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD } } - if (surface->wined3d_texture) - hr = wined3d_texture_set_color_key(surface->wined3d_texture, flags, + if (surface->wined3d_root_texture) + hr = wined3d_texture_set_color_key(surface->wined3d_root_texture, flags, color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); wined3d_mutex_unlock(); @@ -4722,7 +4722,7 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); wined3d_mutex_lock(); - if (!surface->wined3d_texture) + if (!surface->wined3d_root_texture) { wined3d_mutex_unlock(); return DDERR_NOTONMIPMAPSUBLEVEL; @@ -6077,7 +6077,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); root = wined3d_resource_get_parent(resource); - root->wined3d_texture = wined3d_texture; + root->wined3d_root_texture = wined3d_texture; root->is_complex_root = TRUE; texture->root = root; @@ -6189,7 +6189,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); last = wined3d_resource_get_parent(resource); - last->wined3d_texture = wined3d_texture; + last->wined3d_root_texture = wined3d_texture; texture->root = last; if (desc->dwFlags & DDSD_CKDESTOVERLAY) -- 1.9.1