diff options
| author | Brian Paul <brianp@vmware.com> | 2011-08-09 09:00:29 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-08-09 09:04:10 -0600 |
| commit | 32faaea743ca74f4ba29184ef44ebf2c0e962a46 (patch) | |
| tree | 60a9ef6516fd071dc3462cf22fe48048367b055e | |
| parent | 971905bf394e4a6342c206d170abd6661ea38e21 (diff) | |
r300g: silence some warnings about uninitialized variables
| -rw-r--r-- | src/gallium/drivers/r300/compiler/radeon_program_alu.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/compiler/radeon_program_tex.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/gallium/drivers/r300/compiler/radeon_program_alu.c b/src/gallium/drivers/r300/compiler/radeon_program_alu.c index 9fc991166a..e273bc40c2 100644 --- a/src/gallium/drivers/r300/compiler/radeon_program_alu.c +++ b/src/gallium/drivers/r300/compiler/radeon_program_alu.c @@ -87,7 +87,7 @@ static struct rc_instruction *emit3( static struct rc_dst_register dstregtmpmask(int index, int mask) { - struct rc_dst_register dst = {0}; + struct rc_dst_register dst = {0, 0, 0}; dst.File = RC_FILE_TEMPORARY; dst.Index = index; dst.WriteMask = mask; diff --git a/src/gallium/drivers/r300/compiler/radeon_program_tex.c b/src/gallium/drivers/r300/compiler/radeon_program_tex.c index 8d16b2cf9e..9d69ebd18f 100644 --- a/src/gallium/drivers/r300/compiler/radeon_program_tex.c +++ b/src/gallium/drivers/r300/compiler/radeon_program_tex.c @@ -35,7 +35,7 @@ static struct rc_src_register shadow_fail_value(struct r300_fragment_program_compiler *compiler, int tmu) { - struct rc_src_register reg = { 0, }; + struct rc_src_register reg = { 0, 0, 0, 0, 0, 0 }; if (compiler->enable_shadow_ambient) { reg.File = RC_FILE_CONSTANT; @@ -55,7 +55,7 @@ static struct rc_src_register shadow_fail_value(struct r300_fragment_program_com static struct rc_src_register shadow_pass_value(struct r300_fragment_program_compiler *compiler, int tmu) { - struct rc_src_register reg = { 0, }; + struct rc_src_register reg = { 0, 0, 0, 0, 0, 0 }; reg.File = RC_FILE_NONE; reg.Swizzle = combine_swizzles(RC_SWIZZLE_1111, diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index db97e496e1..e7a926829d 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -409,10 +409,11 @@ void r300_decompress_zmask(struct r300_context *r300) void r300_decompress_zmask_locked_unsafe(struct r300_context *r300) { - struct pipe_framebuffer_state fb = {0}; + struct pipe_framebuffer_state fb; + + memset(&fb, 0, sizeof(fb)); fb.width = r300->locked_zbuffer->width; fb.height = r300->locked_zbuffer->height; - fb.nr_cbufs = 0; fb.zsbuf = r300->locked_zbuffer; r300->context.set_framebuffer_state(&r300->context, &fb); @@ -421,8 +422,9 @@ void r300_decompress_zmask_locked_unsafe(struct r300_context *r300) void r300_decompress_zmask_locked(struct r300_context *r300) { - struct pipe_framebuffer_state saved_fb = {0}; + struct pipe_framebuffer_state saved_fb; + memset(&saved_fb, 0, sizeof(saved_fb)); util_copy_framebuffer_state(&saved_fb, r300->fb_state.state); r300_decompress_zmask_locked_unsafe(r300); r300->context.set_framebuffer_state(&r300->context, &saved_fb); |