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
fc7ea69e
Commit
fc7ea69e
authored
May 15, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
May 15, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to context_texture_update().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9cb572cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
context.c
dlls/wined3d/context.c
+7
-5
texture.c
dlls/wined3d/texture.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-2
No files found.
dlls/wined3d/context.c
View file @
fc7ea69e
...
...
@@ -1093,13 +1093,15 @@ void context_gl_resource_released(struct wined3d_device *device,
context_enum_fbo_entries
(
device
,
name
,
rb_namespace
,
context_queue_fbo_entry_destruction
);
}
void
context_texture_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_texture_gl
*
texture_gl
)
void
wined3d_context_gl_texture_update
(
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_texture_gl
*
texture_gl
)
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
fbo_entry
*
entry
=
context
->
current_fbo
;
const
struct
wined3d_gl_info
*
gl_info
=
context
_gl
->
c
.
gl_info
;
struct
fbo_entry
*
entry
=
context
_gl
->
c
.
current_fbo
;
unsigned
int
i
;
if
(
!
entry
||
context
->
rebind_fbo
)
return
;
if
(
!
entry
||
context_gl
->
c
.
rebind_fbo
)
return
;
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
+
1
;
++
i
)
{
...
...
@@ -1107,7 +1109,7 @@ void context_texture_update(struct wined3d_context *context, const struct wined3
||
texture_gl
->
texture_srgb
.
name
==
entry
->
key
.
objects
[
i
].
object
)
{
TRACE
(
"Updated texture %p is bound as attachment %u to the current FBO.
\n
"
,
texture_gl
,
i
);
context
->
rebind_fbo
=
TRUE
;
context
_gl
->
c
.
rebind_fbo
=
TRUE
;
return
;
}
}
...
...
dlls/wined3d/texture.c
View file @
fc7ea69e
...
...
@@ -2127,7 +2127,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s
for
(
i
=
0
;
i
<
device
->
context_count
;
++
i
)
{
context_texture_update
(
device
->
contexts
[
i
]
,
wined3d_texture_gl
(
texture
));
wined3d_context_gl_texture_update
(
wined3d_context_gl
(
device
->
contexts
[
i
])
,
wined3d_texture_gl
(
texture
));
}
}
}
...
...
dlls/wined3d/wined3d_private.h
View file @
fc7ea69e
...
...
@@ -2088,6 +2088,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl,
void
wined3d_context_gl_load_tex_coords
(
const
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_stream_info
*
si
,
GLuint
*
current_bo
,
const
struct
wined3d_state
*
state
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_set_draw_buffer
(
struct
wined3d_context_gl
*
context_gl
,
GLenum
buffer
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_texture_update
(
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_texture_gl
*
texture_gl
)
DECLSPEC_HIDDEN
;
void
wined3d_context_gl_update_stream_sources
(
struct
wined3d_context_gl
*
context_gl
,
const
struct
wined3d_state
*
state
)
DECLSPEC_HIDDEN
;
...
...
@@ -2264,8 +2266,6 @@ 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_texture_update
(
struct
wined3d_context
*
context
,
const
struct
wined3d_texture_gl
*
texture_gl
)
DECLSPEC_HIDDEN
;
void
context_unload_tex_coords
(
const
struct
wined3d_context
*
context
)
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