diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-12-23 23:51:24 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-12-23 23:51:24 +1100 |
| commit | cb6a400dcd26089101c8a29a4eee198bd7ad9a58 (patch) | |
| tree | 5f2b6137442afaad3bff407f2a7f85df36ad27bf /src/mesa/drivers/dri/nouveau/nouveau_state.c | |
| parent | ae8d8d132600cc544b7295c9554e6531bdbd8094 (diff) | |
| download | external_mesa3d-cb6a400dcd26089101c8a29a4eee198bd7ad9a58.zip external_mesa3d-cb6a400dcd26089101c8a29a4eee198bd7ad9a58.tar.gz external_mesa3d-cb6a400dcd26089101c8a29a4eee198bd7ad9a58.tar.bz2 | |
nouveau: maintain numClipRects/pClipRects in context.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_state.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c index d3c233e..8df334d 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_state.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c @@ -62,22 +62,11 @@ static void nouveauCalcViewport(GLcontext *ctx) nouveau_renderbuffer *nrb; const GLfloat *v = ctx->Viewport._WindowMap.m; GLfloat *m = nmesa->viewport.m; - GLfloat xoffset, yoffset; + GLfloat xoffset = nmesa->drawX, yoffset = nmesa->drawY; GLint h = 0; - nrb = nouveau_current_draw_buffer(ctx); nmesa->depth_scale = 1.0 / ctx->DrawBuffer->_DepthMaxF; - if (nrb && nrb->dPriv) { - /* Window */ - xoffset = nrb->dPriv->x; - yoffset = nrb->dPriv->y; - } else { - /* Offscreen or back buffer */ - xoffset = 0.0; - yoffset = 0.0; - } - m[MAT_SX] = v[MAT_SX]; m[MAT_TX] = v[MAT_TX] + xoffset + SUBPIXEL_X; m[MAT_SY] = - v[MAT_SY]; |