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
Lorenzo Ferrillo
wine
Commits
c2ede1d4
Commit
c2ede1d4
authored
13 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Only invalidate state for the current context in swapchain_blit().
parent
68d692f4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/wined3d/context.c
+1
-1
1 addition, 1 deletion
dlls/wined3d/context.c
dlls/wined3d/swapchain.c
+7
-7
7 additions, 7 deletions
dlls/wined3d/swapchain.c
dlls/wined3d/wined3d_private.h
+1
-0
1 addition, 0 deletions
dlls/wined3d/wined3d_private.h
with
9 additions
and
8 deletions
dlls/wined3d/context.c
+
1
−
1
View file @
c2ede1d4
...
...
@@ -1032,7 +1032,7 @@ static void context_enter(struct wined3d_context *context)
}
}
static
void
context_invalidate_state
(
struct
wined3d_context
*
context
,
DWORD
state
)
void
context_invalidate_state
(
struct
wined3d_context
*
context
,
DWORD
state
)
{
DWORD
rep
=
context
->
state_table
[
state
].
representative
;
DWORD
idx
;
...
...
This diff is collapsed.
Click to expand it.
dlls/wined3d/swapchain.c
+
7
−
7
View file @
c2ede1d4
...
...
@@ -281,7 +281,6 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain,
struct
wined3d_context
*
context
,
const
RECT
*
src_rect
,
const
RECT
*
dst_rect
)
{
struct
wined3d_surface
*
backbuffer
=
swapchain
->
back_buffers
[
0
];
struct
wined3d_device
*
device
=
swapchain
->
device
;
UINT
src_w
=
src_rect
->
right
-
src_rect
->
left
;
UINT
src_h
=
src_rect
->
bottom
-
src_rect
->
top
;
GLenum
gl_filter
;
...
...
@@ -309,16 +308,16 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain,
context_bind_fbo
(
context
,
GL_DRAW_FRAMEBUFFER
,
NULL
);
context_set_draw_buffer
(
context
,
GL_BACK
);
device
_invalidate_state
(
device
,
STATE_FRAMEBUFFER
);
context
_invalidate_state
(
context
,
STATE_FRAMEBUFFER
);
glColorMask
(
GL_TRUE
,
GL_TRUE
,
GL_TRUE
,
GL_TRUE
);
device
_invalidate_state
(
device
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE
));
device
_invalidate_state
(
device
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE1
));
device
_invalidate_state
(
device
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE2
));
device
_invalidate_state
(
device
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE3
));
context
_invalidate_state
(
context
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE
));
context
_invalidate_state
(
context
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE1
));
context
_invalidate_state
(
context
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE2
));
context
_invalidate_state
(
context
,
STATE_RENDER
(
WINED3DRS_COLORWRITEENABLE3
));
glDisable
(
GL_SCISSOR_TEST
);
device
_invalidate_state
(
device
,
STATE_RENDER
(
WINED3DRS_SCISSORTESTENABLE
));
context
_invalidate_state
(
context
,
STATE_RENDER
(
WINED3DRS_SCISSORTESTENABLE
));
/* Note that the texture is upside down */
gl_info
->
fbo_ops
.
glBlitFramebuffer
(
src_rect
->
left
,
src_rect
->
top
,
src_rect
->
right
,
src_rect
->
bottom
,
...
...
@@ -329,6 +328,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain,
}
else
{
struct
wined3d_device
*
device
=
swapchain
->
device
;
struct
wined3d_context
*
context2
;
float
tex_left
=
src_rect
->
left
;
float
tex_top
=
src_rect
->
top
;
...
...
This diff is collapsed.
Click to expand it.
dlls/wined3d/wined3d_private.h
+
1
−
0
View file @
c2ede1d4
...
...
@@ -1245,6 +1245,7 @@ void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN
void
context_free_occlusion_query
(
struct
wined3d_occlusion_query
*
query
)
DECLSPEC_HIDDEN
;
struct
wined3d_context
*
context_get_current
(
void
)
DECLSPEC_HIDDEN
;
DWORD
context_get_tls_idx
(
void
)
DECLSPEC_HIDDEN
;
void
context_invalidate_state
(
struct
wined3d_context
*
context
,
DWORD
state_id
)
DECLSPEC_HIDDEN
;
void
context_release
(
struct
wined3d_context
*
context
)
DECLSPEC_HIDDEN
;
void
context_resource_released
(
const
struct
wined3d_device
*
device
,
struct
wined3d_resource
*
resource
,
WINED3DRESOURCETYPE
type
)
DECLSPEC_HIDDEN
;
...
...
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