Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2256a7e8
Commit
2256a7e8
authored
Jul 28, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 29, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: wined3d_device_evict_managed_resources() doesn't need a return value.
parent
3d7c596c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
14 deletions
+10
-14
device.c
dlls/d3d8/device.c
+2
-3
device.c
dlls/d3d9/device.c
+2
-3
ddraw.c
dlls/ddraw/ddraw.c
+4
-4
device.c
dlls/wined3d/device.c
+1
-3
wined3d.h
include/wine/wined3d.h
+1
-1
No files found.
dlls/d3d8/device.c
View file @
2256a7e8
...
...
@@ -361,16 +361,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D
DWORD
Bytes
)
{
IDirect3DDevice8Impl
*
This
=
impl_from_IDirect3DDevice8
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, byte_count %u.
\n
"
,
iface
,
Bytes
);
if
(
Bytes
)
FIXME
(
"Byte count ignored.
\n
"
);
wined3d_mutex_lock
();
hr
=
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
IDirect3DDevice8Impl_GetDirect3D
(
IDirect3DDevice8
*
iface
,
IDirect3D8
**
ppD3D8
)
...
...
dlls/d3d9/device.c
View file @
2256a7e8
...
...
@@ -304,15 +304,14 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(IDirect3DDevice9E
static
HRESULT
WINAPI
IDirect3DDevice9Impl_EvictManagedResources
(
IDirect3DDevice9Ex
*
iface
)
{
IDirect3DDevice9Impl
*
This
=
impl_from_IDirect3DDevice9Ex
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_GetDirect3D
(
IDirect3DDevice9Ex
*
iface
,
...
...
dlls/ddraw/ddraw.c
View file @
2256a7e8
...
...
@@ -5158,15 +5158,15 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device
static
HRESULT
WINAPI
d3d7_EvictManagedTextures
(
IDirect3D7
*
iface
)
{
IDirectDrawImpl
*
This
=
impl_from_IDirect3D7
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p!
\n
"
,
iface
);
EnterCriticalSection
(
&
ddraw_cs
);
if
(
!
This
->
d3d_initialized
)
hr
=
D3D_OK
;
else
hr
=
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
if
(
This
->
d3d_initialized
)
wined3d_device_evict_managed_resources
(
This
->
wined3d_device
);
LeaveCriticalSection
(
&
ddraw_cs
);
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d3_EvictManagedTextures
(
IDirect3D3
*
iface
)
...
...
dlls/wined3d/device.c
View file @
2256a7e8
...
...
@@ -5386,7 +5386,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show)
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
;
...
...
@@ -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. */
device_invalidate_state
(
device
,
STATE_STREAMSRC
);
return
WINED3D_OK
;
}
static
HRESULT
updateSurfaceDesc
(
struct
wined3d_surface
*
surface
,
...
...
include/wine/wined3d.h
View file @
2256a7e8
...
...
@@ -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
);
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_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
);
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment