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
d37472f2
Commit
d37472f2
authored
May 29, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
May 29, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add missing ActivateContext calls to shader_destroy() implementations.
parent
4ada967d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+4
-1
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-0
No files found.
dlls/wined3d/arb_program_shader.c
View file @
d37472f2
...
...
@@ -2503,7 +2503,10 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) {
static
void
shader_arb_destroy
(
IWineD3DBaseShader
*
iface
)
{
IWineD3DBaseShaderImpl
*
baseShader
=
(
IWineD3DBaseShaderImpl
*
)
iface
;
const
WineD3D_GL_Info
*
gl_info
=
&
((
IWineD3DDeviceImpl
*
)
baseShader
->
baseShader
.
device
)
->
adapter
->
gl_info
;
IWineD3DDeviceImpl
*
device
=
(
IWineD3DDeviceImpl
*
)
baseShader
->
baseShader
.
device
;
const
WineD3D_GL_Info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
ActivateContext
(
device
,
device
->
lastActiveRenderTarget
,
CTXUSAGE_RESOURCELOAD
);
if
(
shader_is_pshader_version
(
baseShader
->
baseShader
.
reg_maps
.
shader_version
.
type
))
{
...
...
dlls/wined3d/glsl_shader.c
View file @
d37472f2
...
...
@@ -4295,6 +4295,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) {
*/
char
pshader
=
shader_is_pshader_version
(
This
->
baseShader
.
reg_maps
.
shader_version
.
type
);
ActivateContext
(
device
,
device
->
lastActiveRenderTarget
,
CTXUSAGE_RESOURCELOAD
);
if
(
pshader
)
{
struct
glsl_pshader_private
*
shader_data
;
ps
=
(
IWineD3DPixelShaderImpl
*
)
This
;
...
...
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