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
6bf34c83
Commit
6bf34c83
authored
Jun 28, 2019
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_context_gl structure to find_glsl_pshader().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3d765ae0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-3
No files found.
dlls/wined3d/glsl_shader.c
View file @
6bf34c83
...
...
@@ -8373,12 +8373,11 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g
return
shader_id
;
}
static
GLuint
find_glsl_
pshader
(
const
struct
wined3d_context
*
context
,
static
GLuint
find_glsl_
fragment_shader
(
const
struct
wined3d_context_gl
*
context_gl
,
struct
wined3d_string_buffer
*
buffer
,
struct
wined3d_string_buffer_list
*
string_buffers
,
struct
wined3d_shader
*
shader
,
const
struct
ps_compile_args
*
args
,
const
struct
ps_np2fixup_info
**
np2fixup_info
)
{
const
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl_const
(
context
);
struct
glsl_ps_compiled_shader
*
gl_shaders
,
*
new_array
;
struct
glsl_shader_private
*
shader_data
;
struct
ps_np2fixup_info
*
np2fixup
;
...
...
@@ -10200,7 +10199,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
struct
ps_compile_args
ps_compile_args
;
pshader
=
state
->
shader
[
WINED3D_SHADER_TYPE_PIXEL
];
find_ps_compile_args
(
state
,
pshader
,
context
->
stream_info
.
position_transformed
,
&
ps_compile_args
,
context
);
ps_id
=
find_glsl_
pshader
(
context
,
&
priv
->
shader_buffer
,
&
priv
->
string_buffers
,
ps_id
=
find_glsl_
fragment_shader
(
context_gl
,
&
priv
->
shader_buffer
,
&
priv
->
string_buffers
,
pshader
,
&
ps_compile_args
,
&
np2fixup_info
);
ps_list
=
&
pshader
->
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