Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
b7ac2200
Commit
b7ac2200
authored
May 12, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
May 13, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add missing GL locking to shader_backend_t.shader_select() calls.
parent
7f14ea01
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
context.c
dlls/wined3d/context.c
+3
-0
glsl_shader.c
dlls/wined3d/glsl_shader.c
+8
-0
No files found.
dlls/wined3d/context.c
View file @
b7ac2200
...
...
@@ -1120,7 +1120,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex
/* TODO: Use a display list */
/* Disable shaders */
ENTER_GL
();
This
->
shader_backend
->
shader_select
((
IWineD3DDevice
*
)
This
,
FALSE
,
FALSE
);
LEAVE_GL
();
Context_MarkStateDirty
(
context
,
STATE_VSHADER
,
StateTable
);
Context_MarkStateDirty
(
context
,
STATE_PIXELSHADER
,
StateTable
);
...
...
dlls/wined3d/glsl_shader.c
View file @
b7ac2200
...
...
@@ -3889,12 +3889,20 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) {
ps
=
(
IWineD3DPixelShaderImpl
*
)
This
;
if
(
ps
->
num_gl_shaders
==
0
)
return
;
if
(
priv
->
glsl_program
&&
(
IWineD3DBaseShader
*
)
priv
->
glsl_program
->
pshader
==
iface
)
{
ENTER_GL
();
shader_glsl_select
(
This
->
baseShader
.
device
,
FALSE
,
FALSE
);
LEAVE_GL
();
}
}
else
{
vs
=
(
IWineD3DVertexShaderImpl
*
)
This
;
if
(
vs
->
num_gl_shaders
==
0
)
return
;
if
(
priv
->
glsl_program
&&
(
IWineD3DBaseShader
*
)
priv
->
glsl_program
->
vshader
==
iface
)
{
ENTER_GL
();
shader_glsl_select
(
This
->
baseShader
.
device
,
FALSE
,
FALSE
);
LEAVE_GL
();
}
}
linked_programs
=
&
This
->
baseShader
.
linked_programs
;
...
...
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