diff options
| author | Alex Deucher <[email protected]> | 2009-06-12 12:09:34 -0400 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2009-06-12 12:09:34 -0400 |
| commit | 1036ef2bf468611d37b5df06fc4424f2002e3837 (patch) | |
| tree | f0859a6d903c2570a0a00c918da88139f8f7d065 /src/mesa/drivers/dri/r600 | |
| parent | 917f8bc1a85e61311cef6478127b387df70fba14 (diff) | |
| parent | 1cd0afffc9edbcac690f8ab436aecfced26b0aba (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_assembler.c | 16 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_clear.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c index 9f1d1a3a448..4666518824f 100644 --- a/src/mesa/drivers/dri/r600/r700_assembler.c +++ b/src/mesa/drivers/dri/r600/r700_assembler.c @@ -1057,10 +1057,10 @@ GLboolean assemble_src(r700_AssemblerBase *pAsm, pAsm->S[fld].src.swizzlez = (pILInst->SrcReg[src].Swizzle >> 6) & 0x7; pAsm->S[fld].src.swizzlew = (pILInst->SrcReg[src].Swizzle >> 9) & 0x7; - pAsm->S[fld].src.negx = pILInst->SrcReg[src].NegateBase & 0x1; - pAsm->S[fld].src.negy = (pILInst->SrcReg[src].NegateBase >> 1) & 0x1; - pAsm->S[fld].src.negz = (pILInst->SrcReg[src].NegateBase >> 2) & 0x1; - pAsm->S[fld].src.negw = (pILInst->SrcReg[src].NegateBase >> 3) & 0x1; + pAsm->S[fld].src.negx = pILInst->SrcReg[src].Negate & 0x1; + pAsm->S[fld].src.negy = (pILInst->SrcReg[src].Negate >> 1) & 0x1; + pAsm->S[fld].src.negz = (pILInst->SrcReg[src].Negate >> 2) & 0x1; + pAsm->S[fld].src.negw = (pILInst->SrcReg[src].Negate >> 3) & 0x1; return GL_TRUE; } @@ -1197,10 +1197,10 @@ GLboolean tex_src(r700_AssemblerBase *pAsm) pAsm->S[0].src.swizzlez = (pILInst->SrcReg[0].Swizzle >> 6) & 0x7; pAsm->S[0].src.swizzlew = (pILInst->SrcReg[0].Swizzle >> 9) & 0x7; - pAsm->S[0].src.negx = pILInst->SrcReg[0].NegateBase & 0x1; - pAsm->S[0].src.negy = (pILInst->SrcReg[0].NegateBase >> 1) & 0x1; - pAsm->S[0].src.negz = (pILInst->SrcReg[0].NegateBase >> 2) & 0x1; - pAsm->S[0].src.negw = (pILInst->SrcReg[0].NegateBase >> 3) & 0x1; + pAsm->S[0].src.negx = pILInst->SrcReg[0].Negate & 0x1; + pAsm->S[0].src.negy = (pILInst->SrcReg[0].Negate >> 1) & 0x1; + pAsm->S[0].src.negz = (pILInst->SrcReg[0].Negate >> 2) & 0x1; + pAsm->S[0].src.negw = (pILInst->SrcReg[0].Negate >> 3) & 0x1; return GL_TRUE; } diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c index b62aa66eb29..f142aafd03e 100644 --- a/src/mesa/drivers/dri/r600/r700_clear.c +++ b/src/mesa/drivers/dri/r600/r700_clear.c @@ -57,7 +57,7 @@ static void r700UserClear(GLcontext *ctx, GLuint mask) void r700Clear(GLcontext * ctx, GLbitfield mask) { context_t *context = R700_CONTEXT(ctx); - __DRIdrawablePrivate *dPriv = context->radeon.dri.drawable; + __DRIdrawablePrivate *dPriv = radeon_get_drawable(&context->radeon); const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask); GLbitfield swrast_mask = 0, tri_mask = 0; int i; diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c index 404e946f7ca..329a4aa179a 100644 --- a/src/mesa/drivers/dri/r600/r700_state.c +++ b/src/mesa/drivers/dri/r600/r700_state.c @@ -527,7 +527,7 @@ static void r700UpdateWindow(GLcontext * ctx, int id) //-------------------- context_t *context = R700_CONTEXT(ctx); R700_CHIP_CONTEXT *r700 = (R700_CHIP_CONTEXT*)(&context->hw); - __DRIdrawablePrivate *dPriv = context->radeon.dri.drawable; + __DRIdrawablePrivate *dPriv = radeon_get_drawable(&context->radeon); GLfloat xoffset = dPriv ? (GLfloat) dPriv->x : 0; GLfloat yoffset = dPriv ? (GLfloat) dPriv->y + dPriv->h : 0; const GLfloat *v = ctx->Viewport._WindowMap.m; |