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
bbbab10c
Commit
bbbab10c
authored
Dec 13, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 13, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_cleanup().
parent
fe2ffe1e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
shader.c
dlls/wined3d/shader.c
+7
-9
No files found.
dlls/wined3d/shader.c
View file @
bbbab10c
...
...
@@ -1475,10 +1475,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
}
}
static
void
shader_cleanup
(
IWineD3DBaseShader
*
iface
)
static
void
shader_cleanup
(
IWineD3DBaseShader
Impl
*
shader
)
{
IWineD3DBaseShaderImpl
*
shader
=
(
IWineD3DBaseShaderImpl
*
)
iface
;
shader
->
baseShader
.
device
->
shader_backend
->
shader_destroy
(
shader
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
->
baseShader
.
reg_maps
.
constf
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
->
baseShader
.
function
);
...
...
@@ -1661,7 +1659,7 @@ static ULONG STDMETHODCALLTYPE vertexshader_Release(IWineD3DVertexShader *iface)
if
(
!
refcount
)
{
shader_cleanup
((
IWineD3DBaseShader
*
)
iface
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
shader
->
baseShader
.
parent_ops
->
wined3d_object_destroyed
(
shader
->
baseShader
.
parent
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
);
}
...
...
@@ -1860,7 +1858,7 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl *
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to set function, hr %#x.
\n
"
,
hr
);
shader_cleanup
((
IWineD3DBaseShader
*
)
shader
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
return
hr
;
}
...
...
@@ -1933,7 +1931,7 @@ static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *if
if
(
!
refcount
)
{
shader_cleanup
((
IWineD3DBaseShader
*
)
iface
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
shader
->
base_shader
.
parent_ops
->
wined3d_object_destroyed
(
shader
->
base_shader
.
parent
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
);
}
...
...
@@ -1980,7 +1978,7 @@ HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDevic
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to set function, hr %#x.
\n
"
,
hr
);
shader_cleanup
((
IWineD3DBaseShader
*
)
shader
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
return
hr
;
}
...
...
@@ -2029,7 +2027,7 @@ static ULONG STDMETHODCALLTYPE pixelshader_Release(IWineD3DPixelShader *iface)
if
(
!
refcount
)
{
shader_cleanup
((
IWineD3DBaseShader
*
)
iface
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
shader
->
baseShader
.
parent_ops
->
wined3d_object_destroyed
(
shader
->
baseShader
.
parent
);
HeapFree
(
GetProcessHeap
(),
0
,
shader
);
}
...
...
@@ -2267,7 +2265,7 @@ HRESULT pixelshader_init(IWineD3DPixelShaderImpl *shader, IWineD3DDeviceImpl *de
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to set function, hr %#x.
\n
"
,
hr
);
shader_cleanup
((
IWineD3DBaseShader
*
)
shader
);
shader_cleanup
((
IWineD3DBaseShader
Impl
*
)
shader
);
return
hr
;
}
...
...
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