Commit e4183199 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Fix a sign compare warning in glsl_shader.c.

parent 949cd089
...@@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT ...@@ -769,9 +769,9 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT
} }
} }
static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) static unsigned int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info)
{ {
int ret = GL_LIMITS(glsl_varyings) / 4; unsigned int ret = GL_LIMITS(glsl_varyings) / 4;
/* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */ /* 4.0 shaders do not write clip coords because d3d10 does not support user clipplanes */
if(shader_major > 3) return ret; if(shader_major > 3) return ret;
...@@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * ...@@ -1186,7 +1186,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
if (This->baseShader.reg_maps.shader_version.major >= 3) if (This->baseShader.reg_maps.shader_version.major >= 3)
{ {
DWORD idx = ((IWineD3DPixelShaderImpl *)This)->input_reg_map[reg->idx]; DWORD idx = ((IWineD3DPixelShaderImpl *)This)->input_reg_map[reg->idx];
DWORD in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info); unsigned int in_count = vec4_varyings(This->baseShader.reg_maps.shader_version.major, gl_info);
if (reg->rel_addr) if (reg->rel_addr)
{ {
...@@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in ...@@ -3351,7 +3351,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in
UINT semantic_idx_in, semantic_idx_out; UINT semantic_idx_in, semantic_idx_out;
DWORD *set; DWORD *set;
DWORD in_idx; DWORD in_idx;
DWORD in_count = vec4_varyings(3, gl_info); unsigned int in_count = vec4_varyings(3, gl_info);
char reg_mask[6], reg_mask_out[6]; char reg_mask[6], reg_mask_out[6];
char destination[50]; char destination[50];
WORD input_map, output_map; WORD input_map, output_map;
......
...@@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl { ...@@ -2747,7 +2747,7 @@ typedef struct IWineD3DPixelShaderImpl {
struct wined3d_shader_signature_element input_signature[MAX_REG_INPUT]; struct wined3d_shader_signature_element input_signature[MAX_REG_INPUT];
DWORD input_reg_map[MAX_REG_INPUT]; DWORD input_reg_map[MAX_REG_INPUT];
BOOL input_reg_used[MAX_REG_INPUT]; BOOL input_reg_used[MAX_REG_INPUT];
int declared_in_count; unsigned int declared_in_count;
/* The GL shader */ /* The GL shader */
void *backend_priv; void *backend_priv;
......
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