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
e867d986
Commit
e867d986
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_vshader().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6bf34c83
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+4
-5
No files found.
dlls/wined3d/glsl_shader.c
View file @
e867d986
...
...
@@ -8470,12 +8470,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str
return
!
memcmp
(
stored
->
interpolation_mode
,
new
->
interpolation_mode
,
sizeof
(
new
->
interpolation_mode
));
}
static
GLuint
find_glsl_v
shader
(
const
struct
wined3d_context
*
context
,
struct
shader_glsl_priv
*
priv
,
struct
wined3d_shader
*
shader
,
const
struct
vs_compile_args
*
args
)
static
GLuint
find_glsl_v
ertex_shader
(
const
struct
wined3d_context_gl
*
context_gl
,
struct
shader_glsl_priv
*
priv
,
struct
wined3d_shader
*
shader
,
const
struct
vs_compile_args
*
args
)
{
const
struct
wined3d_context_gl
*
context_gl
=
wined3d_context_gl_const
(
context
);
struct
glsl_vs_compiled_shader
*
gl_shaders
,
*
new_array
;
uint32_t
use_map
=
context
->
stream_info
.
use_map
;
uint32_t
use_map
=
context
_gl
->
c
.
stream_info
.
use_map
;
struct
glsl_shader_private
*
shader_data
;
unsigned
int
i
,
new_size
;
GLuint
ret
;
...
...
@@ -10134,7 +10133,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
vshader
=
state
->
shader
[
WINED3D_SHADER_TYPE_VERTEX
];
find_vs_compile_args
(
state
,
vshader
,
context
->
stream_info
.
swizzle_map
,
&
vs_compile_args
,
context
);
vs_id
=
find_glsl_v
shader
(
context
,
priv
,
vshader
,
&
vs_compile_args
);
vs_id
=
find_glsl_v
ertex_shader
(
context_gl
,
priv
,
vshader
,
&
vs_compile_args
);
vs_list
=
&
vshader
->
linked_programs
;
}
else
if
(
priv
->
vertex_pipe
==
&
glsl_vertex_pipe
)
...
...
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