diff options
| author | Brian Paul <[email protected]> | 2011-10-07 08:22:35 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-10-07 08:23:24 -0600 |
| commit | 9938912ccb7f95961464b52412396489f6c35429 (patch) | |
| tree | 87706a78ec02a22af133f3c4f3836e3dfb729f6d | |
| parent | 8c3b5cf943808faa7c57c19a2b4c7b6fffe653d6 (diff) | |
r300: fix incompatible pointer type warnings
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 2 | ||||
| -rw-r--r-- | 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 51d794c9756..2f7b7ab8534 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 1daa305e3c4..eacc85d02e3 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; |