From 94d697dca6122a6370a16cca2bd87a8c6656b54e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 10 Feb 2016 14:38:37 +1000 Subject: renderer: fix a couple of shadowed variable declarations. This fixes a couple of -Wshadow warnings. Signed-off-by: Dave Airlie --- src/vrend_renderer.c | 6 +++--- src/vrend_shader.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c index b3bf77d..e5ad248 100644 --- a/src/vrend_renderer.c +++ b/src/vrend_renderer.c @@ -6064,9 +6064,9 @@ void vrend_renderer_fill_caps(uint32_t set, uint32_t version, if (epoxy_has_gl_extension("GL_ARB_vertex_type_10f_11f_11f_rev")) { - int i = VIRGL_FORMAT_R11G11B10_FLOAT; - uint32_t offset = i / 32; - uint32_t index = i % 32; + int val = VIRGL_FORMAT_R11G11B10_FLOAT; + uint32_t offset = val / 32; + uint32_t index = val % 32; caps->v1.vertexbuffer.bitmask[offset] |= (1 << index); } diff --git a/src/vrend_shader.c b/src/vrend_shader.c index b5e3d9f..a731837 100644 --- a/src/vrend_shader.c +++ b/src/vrend_shader.c @@ -910,8 +910,8 @@ static int emit_buf(struct dump_ctx *ctx, const char *buf) } #define EMIT_BUF_WITH_RET(ctx, buf) do { \ - int ret = emit_buf((ctx), (buf)); \ - if (ret) return FALSE; \ + int _ret = emit_buf((ctx), (buf)); \ + if (_ret) return FALSE; \ } while(0) static int translate_tex(struct dump_ctx *ctx, -- cgit v1.2.3