From 25cd2c2a8a730d694fb9e4fe839c25c72ddee9a8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 16 Oct 2012 17:54:37 -0600 Subject: [PATCH] svga: silence some MSVC signed/unsigned comparison warnings --- src/gallium/drivers/svga/svga_draw.c | 2 +- src/gallium/drivers/svga/svga_pipe_draw.c | 2 +- src/gallium/drivers/svga/svga_pipe_misc.c | 2 +- src/gallium/drivers/svga/svga_resource_texture.c | 2 +- src/gallium/drivers/svga/svga_sampler_view.c | 3 ++- src/gallium/drivers/svga/svga_state.c | 2 +- src/gallium/drivers/svga/svga_state_fs.c | 2 +- src/gallium/drivers/svga/svga_state_tss.c | 2 +- src/gallium/drivers/svga/svga_swtnl_backend.c | 2 +- src/gallium/drivers/svga/svga_swtnl_state.c | 3 ++- src/gallium/drivers/svga/svga_tgsi_insn.c | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c index 41e0e1adc2f..c0596ddacb6 100644 --- a/src/gallium/drivers/svga/svga_draw.c +++ b/src/gallium/drivers/svga/svga_draw.c @@ -63,7 +63,7 @@ fail: void svga_hwtnl_destroy( struct svga_hwtnl *hwtnl ) { - int i, j; + unsigned i, j; for (i = 0; i < PIPE_PRIM_MAX; i++) { for (j = 0; j < IDX_CACHE_MAX; j++) { diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c index 8c5d274c89d..280c431d609 100644 --- a/src/gallium/drivers/svga/svga_pipe_draw.c +++ b/src/gallium/drivers/svga/svga_pipe_draw.c @@ -59,7 +59,7 @@ svga_user_buffer_range(struct svga_context *svga, unsigned instance_count) { const struct pipe_vertex_element *ve = svga->curr.velems->velem; - int i; + unsigned i; /* * Release old uploaded range (if not done already) and diff --git a/src/gallium/drivers/svga/svga_pipe_misc.c b/src/gallium/drivers/svga/svga_pipe_misc.c index 2b6269a7b2e..7884b6d236b 100644 --- a/src/gallium/drivers/svga/svga_pipe_misc.c +++ b/src/gallium/drivers/svga/svga_pipe_misc.c @@ -75,7 +75,7 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe, struct svga_context *svga = svga_context(pipe); struct pipe_framebuffer_state *dst = &svga->curr.framebuffer; boolean propagate = FALSE; - int i; + unsigned i; dst->width = fb->width; dst->height = fb->height; diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c index 1d796cb6a9b..b703179d04e 100644 --- a/src/gallium/drivers/svga/svga_resource_texture.c +++ b/src/gallium/drivers/svga/svga_resource_texture.c @@ -133,7 +133,7 @@ svga_transfer_dma(struct svga_context *svga, } } else { - unsigned y, h, srcy; + int y, h, srcy; unsigned blockheight = util_format_get_blockheight(st->base.resource->format); h = st->hw_nblocksy * blockheight; srcy = 0; diff --git a/src/gallium/drivers/svga/svga_sampler_view.c b/src/gallium/drivers/svga/svga_sampler_view.c index e8234d624c1..281a44f08ae 100644 --- a/src/gallium/drivers/svga/svga_sampler_view.c +++ b/src/gallium/drivers/svga/svga_sampler_view.c @@ -172,7 +172,8 @@ svga_validate_sampler_view(struct svga_context *svga, struct svga_sampler_view * struct svga_texture *tex = svga_texture(v->texture); unsigned numFaces; unsigned age = 0; - int i, k; + int i; + unsigned k; assert(svga); diff --git a/src/gallium/drivers/svga/svga_state.c b/src/gallium/drivers/svga/svga_state.c index 986f3ad6559..b0bc867f63a 100644 --- a/src/gallium/drivers/svga/svga_state.c +++ b/src/gallium/drivers/svga/svga_state.c @@ -190,7 +190,7 @@ svga_update_state(struct svga_context *svga, unsigned max_level) { struct svga_screen *screen = svga_screen(svga->pipe.screen); enum pipe_error ret = PIPE_OK; - int i; + unsigned i; /* Check for updates to bound textures. This can't be done in an * atom as there is no flag which could provoke this test, and we diff --git a/src/gallium/drivers/svga/svga_state_fs.c b/src/gallium/drivers/svga/svga_state_fs.c index 8503b03eed4..f418ebf45f9 100644 --- a/src/gallium/drivers/svga/svga_state_fs.c +++ b/src/gallium/drivers/svga/svga_state_fs.c @@ -165,7 +165,7 @@ make_fs_key(const struct svga_context *svga, struct svga_fragment_shader *fs, struct svga_fs_compile_key *key) { - int i; + unsigned i; int idx = 0; memset(key, 0, sizeof *key); diff --git a/src/gallium/drivers/svga/svga_state_tss.c b/src/gallium/drivers/svga/svga_state_tss.c index d5ed804b0c0..572eeabccb3 100644 --- a/src/gallium/drivers/svga/svga_state_tss.c +++ b/src/gallium/drivers/svga/svga_state_tss.c @@ -37,7 +37,7 @@ void svga_cleanup_tss_binding(struct svga_context *svga) { - int i; + unsigned i; unsigned count = MAX2( svga->curr.num_sampler_views, svga->state.hw_draw.num_views ); diff --git a/src/gallium/drivers/svga/svga_swtnl_backend.c b/src/gallium/drivers/svga/svga_swtnl_backend.c index 8900cdde18d..ded8bcbd536 100644 --- a/src/gallium/drivers/svga/svga_swtnl_backend.c +++ b/src/gallium/drivers/svga/svga_swtnl_backend.c @@ -177,7 +177,7 @@ svga_vbuf_submit_state( struct svga_vbuf_render *svga_render ) struct svga_context *svga = svga_render->svga; SVGA3dVertexDecl vdecl[PIPE_MAX_ATTRIBS]; enum pipe_error ret; - int i; + unsigned i; /* if the vdecl or vbuf hasn't changed do nothing */ if (!svga->swtnl.new_vdecl) diff --git a/src/gallium/drivers/svga/svga_swtnl_state.c b/src/gallium/drivers/svga/svga_swtnl_state.c index 7d0a1c58f60..134f384cc46 100644 --- a/src/gallium/drivers/svga/svga_swtnl_state.c +++ b/src/gallium/drivers/svga/svga_swtnl_state.c @@ -156,7 +156,8 @@ svga_swtnl_update_vdecl( struct svga_context *svga ) struct svga_fragment_shader *fs = svga->curr.fs; int offset = 0; int nr_decls = 0; - int src, i; + int src; + unsigned i; memset(vinfo, 0, sizeof(*vinfo)); memset(vdecl, 0, sizeof(vdecl)); diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c index 47708167569..2288a534b08 100644 --- a/src/gallium/drivers/svga/svga_tgsi_insn.c +++ b/src/gallium/drivers/svga/svga_tgsi_insn.c @@ -3098,7 +3098,7 @@ static boolean emit_inverted_texcoords( struct svga_shader_emitter *emit ) static INLINE boolean needs_to_create_zero( struct svga_shader_emitter *emit ) { - int i; + unsigned i; if (emit->unit == PIPE_SHADER_FRAGMENT) { if (emit->key.fkey.light_twoside) -- 2.30.2