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
2e63e8f9
Commit
2e63e8f9
authored
Nov 21, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 21, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of surface_bind().
parent
2ca86bca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
surface.c
dlls/wined3d/surface.c
+2
-10
No files found.
dlls/wined3d/surface.c
View file @
2e63e8f9
...
...
@@ -595,14 +595,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
}
/* Context activation is done by the caller. */
static
void
surface_bind
(
struct
wined3d_surface
*
surface
,
struct
wined3d_context
*
context
,
BOOL
srgb
)
{
TRACE
(
"surface %p, context %p, srgb %#x.
\n
"
,
surface
,
context
,
srgb
);
wined3d_texture_bind
(
surface
->
container
,
context
,
srgb
);
}
/* Context activation is done by the caller. */
static
void
surface_bind_and_dirtify
(
struct
wined3d_surface
*
surface
,
struct
wined3d_context
*
context
,
BOOL
srgb
)
{
...
...
@@ -621,7 +613,7 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface,
if
(
active_sampler
!=
WINED3D_UNMAPPED_STAGE
)
context_invalidate_state
(
context
,
STATE_SAMPLER
(
active_sampler
));
surface_bind
(
surface
,
context
,
srgb
);
wined3d_texture_bind
(
surface
->
container
,
context
,
srgb
);
}
static
void
surface_force_reload
(
struct
wined3d_surface
*
surface
)
...
...
@@ -2083,7 +2075,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
surface_prepare_texture
(
dst_surface
,
context
,
FALSE
);
else
surface_load_location
(
dst_surface
,
SFLAG_INTEXTURE
);
surface_bind
(
dst_surface
,
context
,
FALSE
);
wined3d_texture_bind
(
dst_surface
->
container
,
context
,
FALSE
);
data
.
buffer_object
=
src_surface
->
pbo
;
data
.
addr
=
src_surface
->
resource
.
allocatedMemory
;
...
...
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