diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-21 22:27:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-21 22:27:01 +1100 |
| commit | 712478cfdd4a6ec0d0a85d1eaf5907e937c5dfe5 (patch) | |
| tree | eb825df17b0c1bc28641459094eeb5b3e8c1f1d1 | |
| parent | 8ab7c77dc2a29ad3edc1fab4e0c9fb01a15665fa (diff) | |
r300: fix viewport inversion for FBOs
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index f423029ee6..02f29a0a2f 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -933,11 +933,21 @@ static void r300UpdateWindow(GLcontext * ctx) GLfloat xoffset = dPriv ? (GLfloat) dPriv->x : 0; GLfloat yoffset = dPriv ? (GLfloat) dPriv->y + dPriv->h : 0; const GLfloat *v = ctx->Viewport._WindowMap.m; + const GLboolean render_to_fbo = (ctx->DrawBuffer ? (ctx->DrawBuffer->Name != 0) : 0); + GLfloat y_scale, y_bias; + + if (render_to_fbo) { + y_scale = 1.0; + y_bias = 0; + } else { + y_scale = -1.0; + y_bias = yoffset; + } GLfloat sx = v[MAT_SX]; GLfloat tx = v[MAT_TX] + xoffset + SUBPIXEL_X; - GLfloat sy = -v[MAT_SY]; - GLfloat ty = (-v[MAT_TY]) + yoffset + SUBPIXEL_Y; + GLfloat sy = v[MAT_SY] * y_scale; + GLfloat ty = (v[MAT_TY] * y_scale) + y_bias + SUBPIXEL_Y; GLfloat sz = v[MAT_SZ] * rmesa->radeon.state.depth.scale; GLfloat tz = v[MAT_TZ] * rmesa->radeon.state.depth.scale; |