Commit aac8ae73 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

wined3d: Let control_values' type be unsigned int.

parent ccaa09e6
......@@ -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)
{
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment