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
d53643ca
Commit
d53643ca
authored
Jul 29, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to arbfp_free_ffpshader().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7b62dcf0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+4
-3
No files found.
dlls/wined3d/arb_program_shader.c
View file @
d53643ca
...
...
@@ -5722,10 +5722,10 @@ static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend
static
void
arbfp_free_ffpshader
(
struct
wine_rb_entry
*
entry
,
void
*
param
)
{
struct
arbfp_ffp_desc
*
entry_arb
=
WINE_RB_ENTRY_VALUE
(
entry
,
struct
arbfp_ffp_desc
,
parent
.
entry
);
struct
wined3d_context
*
context
=
param
;
struct
wined3d_context
_gl
*
context_gl
=
param
;
const
struct
wined3d_gl_info
*
gl_info
;
gl_info
=
context
->
gl_info
;
gl_info
=
context
_gl
->
c
.
gl_info
;
GL_EXTCALL
(
glDeleteProgramsARB
(
1
,
&
entry_arb
->
shader
));
checkGLcall
(
"delete ffp program"
);
heap_free
(
entry_arb
);
...
...
@@ -5734,9 +5734,10 @@ static void arbfp_free_ffpshader(struct wine_rb_entry *entry, void *param)
/* Context activation is done by the caller. */
static
void
arbfp_free
(
struct
wined3d_device
*
device
,
struct
wined3d_context
*
context
)
{
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl
(
context
);
struct
shader_arb_priv
*
priv
=
device
->
fragment_priv
;
wine_rb_destroy
(
&
priv
->
fragment_shaders
,
arbfp_free_ffpshader
,
context
);
wine_rb_destroy
(
&
priv
->
fragment_shaders
,
arbfp_free_ffpshader
,
context
_gl
);
priv
->
use_arbfp_fixed_func
=
FALSE
;
if
(
device
->
shader_backend
!=
&
arb_program_shader_backend
)
...
...
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