Mesa (master): r300g: silence some warnings about uninitialized variables
Brian Paul
brianp at kemper.freedesktop.org
Tue Aug 9 15:04:40 UTC 2011
Module: Mesa
Branch: master
Commit: 32faaea743ca74f4ba29184ef44ebf2c0e962a46
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32faaea743ca74f4ba29184ef44ebf2c0e962a46
Author: Brian Paul <brianp at vmware.com>
Date: Tue Aug 9 09:00:29 2011 -0600
r300g: silence some warnings about uninitialized variables
---
.../drivers/r300/compiler/radeon_program_alu.c | 2 +-
.../drivers/r300/compiler/radeon_program_tex.c | 4 ++--
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 9fc9911..e273bc4 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 8d16b2c..9d69ebd 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 db97e49..e7a9268 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);
More information about the mesa-commit
mailing list