Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
aac8ae73
Commit
aac8ae73
authored
Dec 01, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Dec 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Let control_values' type be unsigned int.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
parent
ccaa09e6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+3
-3
glsl_shader.c
dlls/wined3d/glsl_shader.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/arb_program_shader.c
View file @
aac8ae73
...
...
@@ -3397,7 +3397,7 @@ static void arbfp_add_sRGB_correction(struct wined3d_string_buffer *buffer, cons
/* [0.0;1.0] clamping. Not needed, this is done implicitly */
}
static
const
DWORD
*
find_loop_control_values
(
const
struct
wined3d_shader
*
shader
,
DWORD
idx
)
static
const
unsigned
int
*
find_loop_control_values
(
const
struct
wined3d_shader
*
shader
,
DWORD
idx
)
{
const
struct
wined3d_shader_lconst
*
constant
;
...
...
@@ -3719,7 +3719,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader,
compiled
->
int_consts
[
i
]
=
WINED3D_CONST_NUM_UNUSED
;
if
(
reg_maps
->
integer_constants
&
(
1u
<<
i
)
&&
priv_ctx
.
target_version
>=
NV2
)
{
const
DWORD
*
control_values
=
find_loop_control_values
(
shader
,
i
);
const
unsigned
int
*
control_values
=
find_loop_control_values
(
shader
,
i
);
if
(
control_values
)
{
...
...
@@ -4167,7 +4167,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader,
compiled
->
int_consts
[
i
]
=
WINED3D_CONST_NUM_UNUSED
;
if
(
reg_maps
->
integer_constants
&
(
1u
<<
i
)
&&
priv_ctx
.
target_version
>=
NV2
)
{
const
DWORD
*
control_values
=
find_loop_control_values
(
shader
,
i
);
const
unsigned
int
*
control_values
=
find_loop_control_values
(
shader
,
i
);
if
(
control_values
)
{
...
...
dlls/wined3d/glsl_shader.c
View file @
aac8ae73
...
...
@@ -4847,7 +4847,7 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins)
const
struct
wined3d_shader
*
shader
=
ins
->
ctx
->
shader
;
const
struct
wined3d_shader_lconst
*
constant
;
struct
wined3d_string_buffer
*
reg_name
;
const
DWORD
*
control_values
=
NULL
;
const
unsigned
int
*
control_values
=
NULL
;
if
(
ins
->
ctx
->
reg_maps
->
shader_version
.
major
<
4
)
{
...
...
@@ -4945,7 +4945,7 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins)
const
struct
wined3d_shader
*
shader
=
ins
->
ctx
->
shader
;
const
struct
wined3d_shader_lconst
*
constant
;
struct
glsl_src_param
src0_param
;
const
DWORD
*
control_values
=
NULL
;
const
unsigned
int
*
control_values
=
NULL
;
/* Try to hardcode local values to help the GLSL compiler to unroll and optimize the loop */
if
(
ins
->
src
[
0
].
reg
.
type
==
WINED3DSPR_CONSTINT
)
...
...
dlls/wined3d/wined3d_private.h
View file @
aac8ae73
...
...
@@ -5834,7 +5834,7 @@ struct wined3d_shader_lconst
{
struct
list
entry
;
unsigned
int
idx
;
DWORD
value
[
4
];
unsigned
int
value
[
4
];
};
struct
wined3d_shader_limits
...
...
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