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

nvc0: fix clipping and use VIEWPORT instead of SCISSOR

Browse source
This commit is contained in:
Christoph Bumiller 2011-02-15 14:41:20 +01:00
parent 19f2272e94
commit e7845e3196
5 changed files with 58 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/drivers/nvc0/nvc0_3d.xml.h
View file

@ -962,15 +962,21 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL 0x0000193c
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK0 0x00000001
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1 0x00000002
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK2 0x00000004
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK3 0x00000008
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK4 0x00000010
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1__MASK 0x00000006
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1__SHIFT 1
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK0 0x00000000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK1 0x00000002
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK2 0x00000004
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_DEPTH_CLAMP_NEAR 0x00000008
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_DEPTH_CLAMP_FAR 0x00000010
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK7 0x00000080
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK10 0x00000400
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK11 0x00000800
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12 0x00001000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK13 0x00002000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12__MASK 0x00003000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12__SHIFT 12
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12_UNK0 0x00000000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12_UNK1 0x00001000
#define NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12_UNK2 0x00002000
#define NVC0_3D_CLIP_RECTS_EN 0x0000194c

2
src/gallium/drivers/nvc0/nvc0_screen.c
View file

@ -550,6 +550,8 @@ nvc0_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
BEGIN_RING(chan, RING_3D(DEPTH_RANGE_NEAR(0)), 2);
OUT_RINGf (chan, 0.0f);
OUT_RINGf (chan, 1.0f);
BEGIN_RING(chan, RING_3D(VIEW_VOLUME_CLIP_CTRL), 1);
OUT_RING (chan, NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK1);
/* We use scissors instead of exact view volume clipping,
* so they're always enabled.

6
src/gallium/drivers/nvc0/nvc0_state.c
View file

@ -177,9 +177,9 @@ nvc0_rasterizer_state_create(struct pipe_context *pipe,
return NULL;
so->pipe = *cso;
#ifndef NVC0_SCISSORS_CLIPPING
SB_IMMED_3D(so, SCISSOR_ENABLE(0), cso->scissor);
#endif
/* Scissor enables are handled in scissor state, we will not want to
* always emit 16 commands, one for each scissor rectangle, here.
*/
SB_BEGIN_3D(so, SHADE_MODEL, 1);
SB_DATA (so, cso->flatshade ? NVC0_3D_SHADE_MODEL_FLAT :

100
src/gallium/drivers/nvc0/nvc0_state_validate.c
View file

@ -117,12 +117,6 @@ nvc0_validate_fb(struct nvc0_context *nvc0)
BEGIN_RING(chan, RING_3D(ZETA_ENABLE), 1);
OUT_RING (chan, 0);
}
#ifndef NVC0_SCISSORS_CLIPPING
BEGIN_RING(chan, RING_3D(VIEWPORT_HORIZ(0)), 2);
OUT_RING (chan, fb->width << 16);
OUT_RING (chan, fb->height << 16);
#endif
}
static void
@ -164,65 +158,54 @@ nvc0_validate_scissor(struct nvc0_context *nvc0)
{
struct nouveau_channel *chan = nvc0->screen->base.channel;
struct pipe_scissor_state *s = &nvc0->scissor;
#ifdef NVC0_SCISSORS_CLIPPING
struct pipe_viewport_state *vp = &nvc0->viewport;
int minx, maxx, miny, maxy;
if (!(nvc0->dirty &
(NVC0_NEW_SCISSOR | NVC0_NEW_VIEWPORT | NVC0_NEW_FRAMEBUFFER)) &&
nvc0->state.scissor == nvc0->rast->pipe.scissor)
if (!(nvc0->dirty & NVC0_NEW_SCISSOR) &&
nvc0->rast->pipe.scissor == nvc0->state.scissor)
return;
nvc0->state.scissor = nvc0->rast->pipe.scissor;
if (nvc0->state.scissor) {
minx = s->minx;
maxx = s->maxx;
miny = s->miny;
maxy = s->maxy;
BEGIN_RING(chan, RING_3D(SCISSOR_HORIZ(0)), 2);
if (nvc0->rast->pipe.scissor) {
OUT_RING(chan, (s->maxx << 16) | s->minx);
OUT_RING(chan, (s->maxy << 16) | s->miny);
} else {
minx = 0;
maxx = nvc0->framebuffer.width;
miny = 0;
maxy = nvc0->framebuffer.height;
OUT_RING(chan, (0xffff << 16) | 0);
OUT_RING(chan, (0xffff << 16) | 0);
}
minx = MAX2(minx, (int)(vp->translate[0] - fabsf(vp->scale[0])));
maxx = MIN2(maxx, (int)(vp->translate[0] + fabsf(vp->scale[0])));
miny = MAX2(miny, (int)(vp->translate[1] - fabsf(vp->scale[1])));
maxy = MIN2(maxy, (int)(vp->translate[1] + fabsf(vp->scale[1])));
BEGIN_RING(chan, RING_3D(SCISSOR_HORIZ(0)), 2);
OUT_RING (chan, (maxx << 16) | minx);
OUT_RING (chan, (maxy << 16) | miny);
BEGIN_RING(chan, RING_3D(VIEWPORT_HORIZ(0)), 2);
OUT_RING (chan, ((maxx - minx) << 16) | minx);
OUT_RING (chan, ((maxy - miny) << 16) | miny);
#else
BEGIN_RING(chan, RING_3D(SCISSOR_HORIZ(0)), 2);
OUT_RING (chan, (s->maxx << 16) | s->minx);
OUT_RING (chan, (s->maxy << 16) | s->miny);
#endif
}
static void
nvc0_validate_viewport(struct nvc0_context *nvc0)
{
struct nouveau_channel *chan = nvc0->screen->base.channel;
struct pipe_viewport_state *vp = &nvc0->viewport;
int x, y, w, h;
float zmin, zmax;
BEGIN_RING(chan, RING_3D(VIEWPORT_TRANSLATE_X(0)), 3);
OUT_RINGf (chan, nvc0->viewport.translate[0]);
OUT_RINGf (chan, nvc0->viewport.translate[1]);
OUT_RINGf (chan, nvc0->viewport.translate[2]);
OUT_RINGf (chan, vp->translate[0]);
OUT_RINGf (chan, vp->translate[1]);
OUT_RINGf (chan, vp->translate[2]);
BEGIN_RING(chan, RING_3D(VIEWPORT_SCALE_X(0)), 3);
OUT_RINGf (chan, nvc0->viewport.scale[0]);
OUT_RINGf (chan, nvc0->viewport.scale[1]);
OUT_RINGf (chan, nvc0->viewport.scale[2]);
OUT_RINGf (chan, vp->scale[0]);
OUT_RINGf (chan, vp->scale[1]);
OUT_RINGf (chan, vp->scale[2]);
#ifdef NVC0_SCISSORS_CLIPPING
/* now set the viewport rectangle to viewport dimensions for clipping */
x = (int)(vp->translate[0] - fabsf(vp->scale[0]));
y = (int)(vp->translate[1] - fabsf(vp->scale[1]));
w = (int)fabsf(2.0f * vp->scale[0]);
h = (int)fabsf(2.0f * vp->scale[1]);
zmin = vp->translate[2] - fabsf(vp->scale[2]);
zmax = vp->translate[2] + fabsf(vp->scale[2]);
BEGIN_RING(chan, RING_3D(VIEWPORT_HORIZ(0)), 2);
OUT_RING (chan, (w << 16) | x);
OUT_RING (chan, (h << 16) | y);
BEGIN_RING(chan, RING_3D(DEPTH_RANGE_NEAR(0)), 2);
OUT_RINGf (chan, nvc0->viewport.translate[2] - nvc0->viewport.scale[2]);
OUT_RINGf (chan, nvc0->viewport.translate[2] + nvc0->viewport.scale[2]);
#endif
OUT_RINGf (chan, zmin);
OUT_RINGf (chan, zmax);
}
static void
@ -231,10 +214,15 @@ nvc0_validate_clip(struct nvc0_context *nvc0)
struct nouveau_channel *chan = nvc0->screen->base.channel;
uint32_t clip;
clip = nvc0->clip.depth_clamp ? 0x201a : 0x0002;
#ifndef NVC0_SCISSORS_CLIPPING
clip |= 0x1080;
#endif
if (nvc0->clip.depth_clamp) {
clip =
NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK1 |
NVC0_3D_VIEW_VOLUME_CLIP_CTRL_DEPTH_CLAMP_NEAR |
NVC0_3D_VIEW_VOLUME_CLIP_CTRL_DEPTH_CLAMP_FAR |
NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK12_UNK2;
} else {
clip = NVC0_3D_VIEW_VOLUME_CLIP_CTRL_UNK1_UNK1;
}
BEGIN_RING(chan, RING_3D(VIEW_VOLUME_CLIP_CTRL), 1);
OUT_RING (chan, clip);
@ -418,13 +406,7 @@ static struct state_validate {
{ nvc0_validate_blend_colour, NVC0_NEW_BLEND_COLOUR },
{ nvc0_validate_stencil_ref, NVC0_NEW_STENCIL_REF },
{ nvc0_validate_stipple, NVC0_NEW_STIPPLE },
#ifdef NVC0_SCISSORS_CLIPPING
{ nvc0_validate_scissor, NVC0_NEW_SCISSOR | NVC0_NEW_VIEWPORT |
NVC0_NEW_RASTERIZER |
NVC0_NEW_FRAMEBUFFER },
#else
{ nvc0_validate_scissor, NVC0_NEW_SCISSOR },
#endif
{ nvc0_validate_scissor, NVC0_NEW_SCISSOR | NVC0_NEW_RASTERIZER },
{ nvc0_validate_viewport, NVC0_NEW_VIEWPORT },
{ nvc0_validate_clip, NVC0_NEW_CLIP },
{ nvc0_vertprog_validate, NVC0_NEW_VERTPROG },

2
src/gallium/drivers/nvc0/nvc0_stateobj.h
View file

@ -4,8 +4,6 @@
#include "pipe/p_state.h"
#define NVC0_SCISSORS_CLIPPING
#define SB_BEGIN_3D(so, m, s) \
(so)->state[(so)->size++] = \
(0x2 << 28) | ((s) << 16) | (NVC0_SUBCH_3D << 13) | ((NVC0_3D_##m) >> 2)