Mesa (master): r300: fix incompatible pointer type warnings

Brian Paul brianp at kemper.freedesktop.org
Fri Oct 7 07:24:35 PDT 2011


Module: Mesa
Branch: master
Commit: 9938912ccb7f95961464b52412396489f6c35429
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9938912ccb7f95961464b52412396489f6c35429

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Oct  7 08:22:35 2011 -0600

r300: fix incompatible pointer type warnings

---

 src/mesa/drivers/dri/r300/r300_state.c    |    2 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 51d794c..2f7b7ab 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -2001,7 +2001,7 @@ static const GLfloat *get_fragmentprogram_constant(struct gl_context *ctx, GLuin
 
 	switch(rcc->Type) {
 	case RC_CONSTANT_EXTERNAL:
-		return ctx->FragmentProgram._Current->Base.Parameters->ParameterValues[rcc->u.External];
+		return &ctx->FragmentProgram._Current->Base.Parameters->ParameterValues[rcc->u.External][0].f;
 	case RC_CONSTANT_IMMEDIATE:
 		return rcc->u.Immediate;
 	case RC_CONSTANT_STATE:
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 1daa305..eacc85d 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -70,7 +70,7 @@ static int r300VertexProgUpdateParams(struct gl_context * ctx, struct r300_verte
 			if (vp->Base->IsNVProgram) {
 				src = ctx->VertexProgram.Parameters[constant->u.External];
 			} else {
-				src = vp->Base->Base.Parameters->ParameterValues[constant->u.External];
+				src = &vp->Base->Base.Parameters->ParameterValues[constant->u.External][0].f;
 			}
 			break;
 



More information about the mesa-commit mailing list