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
f4f20e48
Commit
f4f20e48
authored
Mar 14, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a texture to context_surface_update().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
31e5b4e5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
context.c
dlls/wined3d/context.c
+4
-4
surface.c
dlls/wined3d/surface.c
+1
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/context.c
View file @
f4f20e48
...
...
@@ -1092,7 +1092,7 @@ void context_gl_resource_released(struct wined3d_device *device,
context_enum_fbo_entries
(
device
,
name
,
rb_namespace
,
context_queue_fbo_entry_destruction
);
}
void
context_
surface_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surfac
e
)
void
context_
texture_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_texture
*
textur
e
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
fbo_entry
*
entry
=
context
->
current_fbo
;
...
...
@@ -1102,10 +1102,10 @@ void context_surface_update(struct wined3d_context *context, const struct wined3
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
+
1
;
++
i
)
{
if
(
surface
->
container
->
texture_rgb
.
name
==
entry
->
key
.
objects
[
i
].
object
||
surface
->
container
->
texture_srgb
.
name
==
entry
->
key
.
objects
[
i
].
object
)
if
(
texture
->
texture_rgb
.
name
==
entry
->
key
.
objects
[
i
].
object
||
texture
->
texture_srgb
.
name
==
entry
->
key
.
objects
[
i
].
object
)
{
TRACE
(
"Updated
surface %p is bound as attachment %u to the current FBO.
\n
"
,
surfac
e
,
i
);
TRACE
(
"Updated
texture %p is bound as attachment %u to the current FBO.
\n
"
,
textur
e
,
i
);
context
->
rebind_fbo
=
TRUE
;
return
;
}
...
...
dlls/wined3d/surface.c
View file @
f4f20e48
...
...
@@ -912,13 +912,12 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s
if
(
gl_info
->
quirks
&
WINED3D_QUIRK_FBO_TEX_UPDATE
)
{
struct
wined3d_surface
*
surface
=
texture
->
sub_resources
[
sub_resource_idx
].
u
.
surface
;
struct
wined3d_device
*
device
=
texture
->
resource
.
device
;
unsigned
int
i
;
for
(
i
=
0
;
i
<
device
->
context_count
;
++
i
)
{
context_
surface_update
(
device
->
contexts
[
i
],
surfac
e
);
context_
texture_update
(
device
->
contexts
[
i
],
textur
e
);
}
}
}
...
...
dlls/wined3d/wined3d_private.h
View file @
f4f20e48
...
...
@@ -2185,7 +2185,7 @@ void context_state_drawbuf(struct wined3d_context *context,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
DECLSPEC_HIDDEN
;
void
context_state_fb
(
struct
wined3d_context
*
context
,
const
struct
wined3d_state
*
state
,
DWORD
state_id
)
DECLSPEC_HIDDEN
;
void
context_
surface_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surfac
e
)
DECLSPEC_HIDDEN
;
void
context_
texture_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_texture
*
textur
e
)
DECLSPEC_HIDDEN
;
void
context_unmap_bo_address
(
struct
wined3d_context
*
context
,
const
struct
wined3d_bo_address
*
data
,
GLenum
binding
)
DECLSPEC_HIDDEN
;
...
...
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