Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
35515e46
Commit
35515e46
authored
13 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Remove surface_draw_overlay from wined3d_surface_ops.
parent
48b6050c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/wined3d/surface.c
+5
-13
5 additions, 13 deletions
dlls/wined3d/surface.c
dlls/wined3d/wined3d_private.h
+0
-1
0 additions, 1 deletion
dlls/wined3d/wined3d_private.h
with
5 additions
and
14 deletions
dlls/wined3d/surface.c
+
5
−
13
View file @
35515e46
...
...
@@ -1019,7 +1019,7 @@ static void surface_unmap(struct wined3d_surface *surface)
done:
/* Overlays have to be redrawn manually after changes with the GL implementation */
if
(
surface
->
overlay_dest
)
surface
->
surface_ops
->
surface_draw_overlay
(
surface
);
surface_draw_overlay
(
surface
);
}
static
BOOL
surface_is_full_rect
(
const
struct
wined3d_surface
*
surface
,
const
RECT
*
r
)
...
...
@@ -1908,7 +1908,6 @@ static const struct wined3d_surface_ops surface_ops =
{
surface_private_setup
,
surface_realize_palette
,
surface_draw_overlay
,
surface_map
,
surface_unmap
,
};
...
...
@@ -1995,12 +1994,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface)
}
}
static
HRESULT
gdi_surface_draw_overlay
(
struct
wined3d_surface
*
surface
)
{
FIXME
(
"GDI surfaces can't draw overlays yet.
\n
"
);
return
E_FAIL
;
}
static
void
gdi_surface_map
(
struct
wined3d_surface
*
surface
,
const
RECT
*
rect
,
DWORD
flags
)
{
TRACE
(
"surface %p, rect %s, flags %#x.
\n
"
,
...
...
@@ -2036,7 +2029,6 @@ static const struct wined3d_surface_ops gdi_surface_ops =
{
gdi_surface_private_setup
,
gdi_surface_realize_palette
,
gdi_surface_draw_overlay
,
gdi_surface_map
,
gdi_surface_unmap
,
};
...
...
@@ -3216,7 +3208,7 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa
surface
->
overlay_destrect
.
right
=
x
+
w
;
surface
->
overlay_destrect
.
bottom
=
y
+
h
;
surface
->
surface_ops
->
surface_draw_overlay
(
surface
);
surface_draw_overlay
(
surface
);
return
WINED3D_OK
;
}
...
...
@@ -3326,7 +3318,7 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co
surface
->
overlay_dest
=
NULL
;
}
surface
->
surface_ops
->
surface_draw_overlay
(
surface
);
surface_draw_overlay
(
surface
);
return
WINED3D_OK
;
}
...
...
@@ -3941,7 +3933,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined
/* Update overlays if they're visible. */
if
((
surface
->
resource
.
usage
&
WINED3DUSAGE_OVERLAY
)
&&
surface
->
overlay_dest
)
return
surface
->
surface_ops
->
surface_draw_overlay
(
surface
);
return
surface_draw_overlay
(
surface
);
return
WINED3D_OK
;
}
...
...
@@ -5794,7 +5786,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO
{
LIST_FOR_EACH_ENTRY
(
overlay
,
&
surface
->
overlays
,
struct
wined3d_surface
,
overlay_entry
)
{
overlay
->
surface_ops
->
surface_draw_overlay
(
overlay
);
surface_draw_overlay
(
overlay
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dlls/wined3d/wined3d_private.h
+
0
−
1
View file @
35515e46
...
...
@@ -2001,7 +2001,6 @@ struct wined3d_surface_ops
{
HRESULT
(
*
surface_private_setup
)(
struct
wined3d_surface
*
surface
);
void
(
*
surface_realize_palette
)(
struct
wined3d_surface
*
surface
);
HRESULT
(
*
surface_draw_overlay
)(
struct
wined3d_surface
*
surface
);
void
(
*
surface_map
)(
struct
wined3d_surface
*
surface
,
const
RECT
*
rect
,
DWORD
flags
);
void
(
*
surface_unmap
)(
struct
wined3d_surface
*
surface
);
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment