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
f45aeb4a
Commit
f45aeb4a
authored
Nov 30, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 01, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass an IWineD3DDeviceImpl pointer to shader_free_private().
parent
4a698749
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+5
-5
device.c
dlls/wined3d/device.c
+5
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+6
-6
shader.c
dlls/wined3d/shader.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
f45aeb4a
...
...
@@ -4770,10 +4770,10 @@ static void release_signature(struct wine_rb_entry *entry, void *context)
}
/* Context activation is done by the caller. */
static
void
shader_arb_free
(
IWineD3DDevice
*
iface
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
const
struct
wined3d_gl_info
*
gl_info
=
&
This
->
adapter
->
gl_info
;
struct
shader_arb_priv
*
priv
=
This
->
shader_priv
;
static
void
shader_arb_free
(
IWineD3DDevice
Impl
*
device
)
{
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
shader_arb_priv
*
priv
=
device
->
shader_priv
;
int
i
;
ENTER_GL
();
...
...
@@ -4794,7 +4794,7 @@ static void shader_arb_free(IWineD3DDevice *iface) {
LEAVE_GL
();
wine_rb_destroy
(
&
priv
->
signature_tree
,
release_signature
,
NULL
);
HeapFree
(
GetProcessHeap
(),
0
,
This
->
shader_priv
);
HeapFree
(
GetProcessHeap
(),
0
,
device
->
shader_priv
);
}
static
BOOL
shader_arb_dirty_const
(
IWineD3DDevice
*
iface
)
{
...
...
dlls/wined3d/device.c
View file @
f45aeb4a
...
...
@@ -2056,7 +2056,7 @@ err_out:
This
->
frag_pipe
->
free_private
(
iface
);
}
if
(
This
->
shader_priv
)
{
This
->
shader_backend
->
shader_free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
This
);
}
return
hr
;
}
...
...
@@ -2187,7 +2187,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface,
/* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */
This
->
blitter
->
free_private
(
iface
);
This
->
frag_pipe
->
free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
This
);
/* Release the buffers (with sanity checks)*/
if
(
This
->
onscreen_depth_stencil
)
...
...
@@ -6201,7 +6201,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl
This
->
blitter
->
free_private
(
iface
);
This
->
frag_pipe
->
free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
This
);
destroy_dummy_textures
(
This
,
gl_info
);
context_release
(
context
);
...
...
@@ -6255,7 +6255,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to allocate fragment pipe private data, hr %#x.
\n
"
,
hr
);
This
->
shader_backend
->
shader_free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
This
);
goto
err
;
}
...
...
@@ -6264,7 +6264,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap
{
ERR
(
"Failed to allocate blitter private data, hr %#x.
\n
"
,
hr
);
This
->
frag_pipe
->
free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
iface
);
This
->
shader_backend
->
shader_free_private
(
This
);
goto
err
;
}
...
...
dlls/wined3d/glsl_shader.c
View file @
f45aeb4a
...
...
@@ -4871,10 +4871,10 @@ fail:
}
/* Context activation is done by the caller. */
static
void
shader_glsl_free
(
IWineD3DDevice
*
iface
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
const
struct
wined3d_gl_info
*
gl_info
=
&
This
->
adapter
->
gl_info
;
struct
shader_glsl_priv
*
priv
=
This
->
shader_priv
;
static
void
shader_glsl_free
(
IWineD3DDevice
Impl
*
device
)
{
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
shader_glsl_priv
*
priv
=
device
->
shader_priv
;
int
i
;
ENTER_GL
();
...
...
@@ -4897,8 +4897,8 @@ static void shader_glsl_free(IWineD3DDevice *iface) {
HeapFree
(
GetProcessHeap
(),
0
,
priv
->
stack
);
shader_buffer_free
(
&
priv
->
shader_buffer
);
HeapFree
(
GetProcessHeap
(),
0
,
This
->
shader_priv
);
This
->
shader_priv
=
NULL
;
HeapFree
(
GetProcessHeap
(),
0
,
device
->
shader_priv
);
device
->
shader_priv
=
NULL
;
}
static
BOOL
shader_glsl_dirty_const
(
IWineD3DDevice
*
iface
)
{
...
...
dlls/wined3d/shader.c
View file @
f45aeb4a
...
...
@@ -1520,7 +1520,7 @@ static void shader_none_load_np2fixup_constants(void *shader_priv,
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_state
*
state
)
{}
static
void
shader_none_destroy
(
IWineD3DBaseShader
*
iface
)
{}
static
HRESULT
shader_none_alloc
(
IWineD3DDeviceImpl
*
device
)
{
return
WINED3D_OK
;}
static
void
shader_none_free
(
IWineD3DDevice
*
ifa
ce
)
{}
static
void
shader_none_free
(
IWineD3DDevice
Impl
*
devi
ce
)
{}
static
BOOL
shader_none_dirty_const
(
IWineD3DDevice
*
iface
)
{
return
FALSE
;}
static
void
shader_none_get_caps
(
const
struct
wined3d_gl_info
*
gl_info
,
struct
shader_caps
*
caps
)
...
...
dlls/wined3d/wined3d_private.h
View file @
f45aeb4a
...
...
@@ -760,7 +760,7 @@ typedef struct {
const
struct
wined3d_state
*
state
);
void
(
*
shader_destroy
)(
IWineD3DBaseShader
*
iface
);
HRESULT
(
*
shader_alloc_private
)(
IWineD3DDeviceImpl
*
device
);
void
(
*
shader_free_private
)(
IWineD3DDevice
*
ifa
ce
);
void
(
*
shader_free_private
)(
IWineD3DDevice
Impl
*
devi
ce
);
BOOL
(
*
shader_dirtifyable_constants
)(
IWineD3DDevice
*
iface
);
void
(
*
shader_get_caps
)(
const
struct
wined3d_gl_info
*
gl_info
,
struct
shader_caps
*
caps
);
BOOL
(
*
shader_color_fixup_supported
)(
struct
color_fixup_desc
fixup
);
...
...
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