ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: wined3d_device_evict_managed_resources() doesn't need a return value.

This commit is contained in:
Henri Verbeet 2011-07-28 22:27:54 +02:00 committed by Alexandre Julliard
parent 3d7c596cdc
commit 2256a7e804
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d8/device.c
View File

@ -361,16 +361,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D
DWORD Bytes) DWORD Bytes)
{ {
IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface);
HRESULT hr;
TRACE("iface %p, byte_count %u.\n", iface, Bytes); TRACE("iface %p, byte_count %u.\n", iface, Bytes);
if (Bytes) FIXME("Byte count ignored.\n"); if (Bytes) FIXME("Byte count ignored.\n");
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_device_evict_managed_resources(This->wined3d_device);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return D3D_OK;
} }
static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8)

5
dlls/d3d9/device.c
View File

@ -304,15 +304,14 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(IDirect3DDevice9E
static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(IDirect3DDevice9Ex *iface) static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(IDirect3DDevice9Ex *iface)
{ {
IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_device_evict_managed_resources(This->wined3d_device);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return D3D_OK;
} }
static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface, static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface,

8
dlls/ddraw/ddraw.c
View File

@ -5158,15 +5158,15 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device
static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface)
{ {
IDirectDrawImpl *This = impl_from_IDirect3D7(iface); IDirectDrawImpl *This = impl_from_IDirect3D7(iface);
HRESULT hr;
TRACE("iface %p!\n", iface); TRACE("iface %p!\n", iface);
EnterCriticalSection(&ddraw_cs); EnterCriticalSection(&ddraw_cs);
if (!This->d3d_initialized) hr = D3D_OK; if (This->d3d_initialized)
else hr = wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_device_evict_managed_resources(This->wined3d_device);
LeaveCriticalSection(&ddraw_cs); LeaveCriticalSection(&ddraw_cs);
return hr; return D3D_OK;
} }
static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface)

4
dlls/wined3d/device.c
View File

@ -5386,7 +5386,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show)
return oldVisible; return oldVisible;
} }
HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device)
{ {
struct wined3d_resource *resource, *cursor; struct wined3d_resource *resource, *cursor;
@ -5405,8 +5405,6 @@ HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *devi
/* Invalidate stream sources, the buffer(s) may have been evicted. */ /* Invalidate stream sources, the buffer(s) may have been evicted. */
device_invalidate_state(device, STATE_STREAMSRC); device_invalidate_state(device, STATE_STREAMSRC);
return WINED3D_OK;
} }
static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, static HRESULT updateSurfaceDesc(struct wined3d_surface *surface,

2
include/wine/wined3d.h
View File

@ -2204,7 +2204,7 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN
const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info);
HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock);
HRESULT __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);
UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device);
HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx,
UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer);