Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
2abecc46
Commit
2abecc46
authored
Jul 16, 2014
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jul 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Remove wined3d_surface_set/get_priority.
parent
8b367c79
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
16 deletions
+2
-16
surface.c
dlls/ddraw/surface.c
+2
-2
surface.c
dlls/wined3d/surface.c
+0
-10
wined3d.spec
dlls/wined3d/wined3d.spec
+0
-2
wined3d.h
include/wine/wined3d.h
+0
-2
No files found.
dlls/ddraw/surface.c
View file @
2abecc46
...
@@ -2247,7 +2247,7 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO
...
@@ -2247,7 +2247,7 @@ static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWO
}
}
else
else
{
{
wined3d_
surface_set_priority
(
surface
->
wined3d_surfac
e
,
priority
);
wined3d_
texture_set_priority
(
surface
->
wined3d_textur
e
,
priority
);
hr
=
DD_OK
;
hr
=
DD_OK
;
}
}
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
...
@@ -2276,7 +2276,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO
...
@@ -2276,7 +2276,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO
}
}
else
else
{
{
*
priority
=
wined3d_
surface_get_priority
(
surface
->
wined3d_surfac
e
);
*
priority
=
wined3d_
texture_get_priority
(
surface
->
wined3d_textur
e
);
hr
=
DD_OK
;
hr
=
DD_OK
;
}
}
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
...
...
dlls/wined3d/surface.c
View file @
2abecc46
...
@@ -2205,16 +2205,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface)
...
@@ -2205,16 +2205,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface)
return
refcount
;
return
refcount
;
}
}
DWORD
CDECL
wined3d_surface_set_priority
(
struct
wined3d_surface
*
surface
,
DWORD
priority
)
{
return
resource_set_priority
(
&
surface
->
resource
,
priority
);
}
DWORD
CDECL
wined3d_surface_get_priority
(
const
struct
wined3d_surface
*
surface
)
{
return
resource_get_priority
(
&
surface
->
resource
);
}
void
CDECL
wined3d_surface_preload
(
struct
wined3d_surface
*
surface
)
void
CDECL
wined3d_surface_preload
(
struct
wined3d_surface
*
surface
)
{
{
TRACE
(
"surface %p.
\n
"
,
surface
);
TRACE
(
"surface %p.
\n
"
,
surface
);
...
...
dlls/wined3d/wined3d.spec
View file @
2abecc46
...
@@ -210,7 +210,6 @@
...
@@ -210,7 +210,6 @@
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_get_priority(ptr)
@ cdecl wined3d_surface_get_render_target_data(ptr ptr)
@ cdecl wined3d_surface_get_render_target_data(ptr ptr)
@ cdecl wined3d_surface_get_resource(ptr)
@ cdecl wined3d_surface_get_resource(ptr)
@ cdecl wined3d_surface_getdc(ptr ptr)
@ cdecl wined3d_surface_getdc(ptr ptr)
...
@@ -221,7 +220,6 @@
...
@@ -221,7 +220,6 @@
@ cdecl wined3d_surface_releasedc(ptr ptr)
@ cdecl wined3d_surface_releasedc(ptr ptr)
@ cdecl wined3d_surface_restore(ptr)
@ cdecl wined3d_surface_restore(ptr)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
@ cdecl wined3d_surface_set_priority(ptr long)
@ cdecl wined3d_surface_unmap(ptr)
@ cdecl wined3d_surface_unmap(ptr)
@ cdecl wined3d_surface_update_desc(ptr long long long long long ptr long)
@ cdecl wined3d_surface_update_desc(ptr long long long long long ptr long)
@ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
@ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr)
...
...
include/wine/wined3d.h
View file @
2abecc46
...
@@ -2401,7 +2401,6 @@ HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *su
...
@@ -2401,7 +2401,6 @@ HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *su
HRESULT
__cdecl
wined3d_surface_get_overlay_position
(
const
struct
wined3d_surface
*
surface
,
LONG
*
x
,
LONG
*
y
);
HRESULT
__cdecl
wined3d_surface_get_overlay_position
(
const
struct
wined3d_surface
*
surface
,
LONG
*
x
,
LONG
*
y
);
void
*
__cdecl
wined3d_surface_get_parent
(
const
struct
wined3d_surface
*
surface
);
void
*
__cdecl
wined3d_surface_get_parent
(
const
struct
wined3d_surface
*
surface
);
DWORD
__cdecl
wined3d_surface_get_pitch
(
const
struct
wined3d_surface
*
surface
);
DWORD
__cdecl
wined3d_surface_get_pitch
(
const
struct
wined3d_surface
*
surface
);
DWORD
__cdecl
wined3d_surface_get_priority
(
const
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_get_render_target_data
(
struct
wined3d_surface
*
surface
,
HRESULT
__cdecl
wined3d_surface_get_render_target_data
(
struct
wined3d_surface
*
surface
,
struct
wined3d_surface
*
render_target
);
struct
wined3d_surface
*
render_target
);
struct
wined3d_resource
*
__cdecl
wined3d_surface_get_resource
(
struct
wined3d_surface
*
surface
);
struct
wined3d_resource
*
__cdecl
wined3d_surface_get_resource
(
struct
wined3d_surface
*
surface
);
...
@@ -2414,7 +2413,6 @@ void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);
...
@@ -2414,7 +2413,6 @@ void __cdecl wined3d_surface_preload(struct wined3d_surface *surface);
HRESULT
__cdecl
wined3d_surface_releasedc
(
struct
wined3d_surface
*
surface
,
HDC
dc
);
HRESULT
__cdecl
wined3d_surface_releasedc
(
struct
wined3d_surface
*
surface
,
HDC
dc
);
HRESULT
__cdecl
wined3d_surface_restore
(
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_restore
(
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_set_overlay_position
(
struct
wined3d_surface
*
surface
,
LONG
x
,
LONG
y
);
HRESULT
__cdecl
wined3d_surface_set_overlay_position
(
struct
wined3d_surface
*
surface
,
LONG
x
,
LONG
y
);
DWORD
__cdecl
wined3d_surface_set_priority
(
struct
wined3d_surface
*
surface
,
DWORD
new_priority
);
HRESULT
__cdecl
wined3d_surface_unmap
(
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_unmap
(
struct
wined3d_surface
*
surface
);
HRESULT
__cdecl
wined3d_surface_update_desc
(
struct
wined3d_surface
*
surface
,
HRESULT
__cdecl
wined3d_surface_update_desc
(
struct
wined3d_surface
*
surface
,
UINT
width
,
UINT
height
,
enum
wined3d_format_id
format_id
,
UINT
width
,
UINT
height
,
enum
wined3d_format_id
format_id
,
...
...
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