fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-22 12:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nv50: use correct scissor reg

Browse source
This commit is contained in:
Christoph Bumiller 2009-07-29 00:35:12 +02:00 • committed by Ben Skeggs
parent 8c56029b1e
commit b0341f994f
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/nv50/nv50_screen.c
View file

@ -417,6 +417,10 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
so_method(so, screen->tesla, 0x1234, 1);
so_data (so, 1);
/* activate first scissor rectangle */
so_method(so, screen->tesla, NV50TCL_SCISSOR_ENABLE, 1);
so_data (so, 1);
so_emit(chan, so);
so_ref (so, &screen->static_init);
so_ref (NULL, &so);

23
src/gallium/drivers/nv50/nv50_state_validate.c
View file

@ -119,12 +119,18 @@ nv50_state_validate_fb(struct nv50_context *nv50)
so_method(so, tesla, NV50TCL_VIEWPORT_HORIZ, 2);
so_data (so, w << 16);
so_data (so, h << 16);
so_method(so, tesla, 0x0e04, 2);
/* set window scissor rectangle to window extents */
so_method(so, tesla, NV50TCL_SCISSOR_HORIZ, 2);
so_data (so, w << 16);
so_data (so, h << 16);
so_method(so, tesla, 0xdf8, 2);
/* set window lower left corner */
so_method(so, tesla, NV50TCL_WINDOW_LEFT, 2);
so_data (so, 0);
so_data (so, h);
/* set screen scissor rectangle */
so_method(so, tesla, NV50TCL_SCREEN_SCISSOR_HORIZ, 2);
so_data (so, w << 16);
so_data (so, h << 16);
so_ref(so, &nv50->state.fb);
so_ref(NULL, &so);
@ -233,13 +239,16 @@ nv50_state_validate(struct nv50_context *nv50)
nv50->state.scissor_enabled = rast->scissor;
so = so_new(3, 0);
so_method(so, tesla, 0x0ff4, 2);
so_method(so, tesla, NV50TCL_SCISSOR_HORIZ, 2);
if (nv50->state.scissor_enabled) {
so_data(so, ((s->maxx - s->minx) << 16) | s->minx);
so_data(so, ((s->maxy - s->miny) << 16) | s->miny);
/* the hw has y = 0 = bottom here */
unsigned top = nv50->framebuffer.height - s->miny;
unsigned bottom = nv50->framebuffer.height - s->maxy;
so_data(so, (s->maxx << 16) | s->minx);
so_data(so, (top << 16) | bottom);
} else {
so_data(so, (8192 << 16));
so_data(so, (8192 << 16));
so_data(so, (nv50->framebuffer.width << 16));
so_data(so, (nv50->framebuffer.height << 16));
}
so_ref(so, &nv50->state.scissor);
so_ref(NULL, &so);