Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
bfac6c99
Commit
bfac6c99
authored
Jan 27, 2022
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 27, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use wined3d_bit_scan() in set_glsl_shader_program().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c265f2f2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
glsl_shader.c
dlls/wined3d/glsl_shader.c
+3
-5
No files found.
dlls/wined3d/glsl_shader.c
View file @
bfac6c99
...
...
@@ -10231,6 +10231,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
struct
wined3d_shader
*
pshader
=
NULL
;
GLuint
reorder_shader_id
=
0
;
struct
glsl_program_key
key
;
uint32_t
attribs_map
;
GLuint
program_id
;
unsigned
int
i
;
GLuint
vs_id
=
0
;
...
...
@@ -10239,7 +10240,6 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
GLuint
gs_id
=
0
;
GLuint
ps_id
=
0
;
struct
list
*
ps_list
,
*
vs_list
;
WORD
attribs_map
;
struct
wined3d_string_buffer
*
tmp_name
;
if
(
!
(
context_gl
->
c
.
shader_update_mask
&
(
1u
<<
WINED3D_SHADER_TYPE_VERTEX
))
&&
ctx_data
->
glsl_program
)
...
...
@@ -10417,11 +10417,9 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
* in order to make the bindings work, and it has to be done prior
* to linking the GLSL program. */
tmp_name
=
string_buffer_get
(
&
priv
->
string_buffers
);
for
(
i
=
0
;
attribs_map
;
attribs_map
>>=
1
,
++
i
)
while
(
attribs_map
)
{
if
(
!
(
attribs_map
&
1
))
continue
;
i
=
wined3d_bit_scan
(
&
attribs_map
);
string_buffer_sprintf
(
tmp_name
,
"vs_in%u"
,
i
);
GL_EXTCALL
(
glBindAttribLocation
(
program_id
,
i
,
tmp_name
->
buffer
));
if
(
vshader
&&
vshader
->
reg_maps
.
shader_version
.
major
>=
4
)
...
...
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