diff options
| author | Ilia Mirkin <[email protected]> | 2016-07-01 00:59:58 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2016-07-01 01:04:10 -0400 |
| commit | 51ca57df0196837e5ac754fd8e54e64205a5b957 (patch) | |
| tree | e28f1819bdfc6fc87f78be82c5cc2bb86b71b866 /src/gallium/drivers/nouveau/nv30 | |
| parent | 71609c99548ab3724e604d59b771ef1c83eac4fe (diff) | |
nv30: go back to not using viewport validate function for swtnl
The output of draw requires a null viewport transform, which the regular
code is ill-equiped to do. Reinstate the original settings in the render
path, and add setting of the viewport clip polygon based on fb
width/height (as that is all taken care of by draw).
Signed-off-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv30')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_draw.c | 16 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_state_validate.c | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c b/src/gallium/drivers/nouveau/nv30/nv30_draw.c index 041c73ca72a..10c9f56fad5 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c @@ -342,6 +342,22 @@ nv30_render_validate(struct nv30_context *nv30) for (; i < 16; i++) r->vtxfmt[i] = NV30_3D_VTXFMT_TYPE_V32_FLOAT; + BEGIN_NV04(push, NV30_3D(VIEWPORT_TRANSLATE_X), 8); + PUSH_DATAf(push, 0.0); + PUSH_DATAf(push, 0.0); + PUSH_DATAf(push, 0.0); + PUSH_DATAf(push, 0.0); + PUSH_DATAf(push, 1.0); + PUSH_DATAf(push, 1.0); + PUSH_DATAf(push, 1.0); + PUSH_DATAf(push, 1.0); + BEGIN_NV04(push, NV30_3D(DEPTH_RANGE_NEAR), 2); + PUSH_DATAf(push, 0.0); + PUSH_DATAf(push, 1.0); + BEGIN_NV04(push, NV30_3D(VIEWPORT_HORIZ), 2); + PUSH_DATA (push, nv30->framebuffer.width << 16); + PUSH_DATA (push, nv30->framebuffer.height << 16); + BEGIN_NV04(push, NV30_3D(VTXFMT(0)), 16); PUSH_DATAp(push, r->vtxfmt, 16); diff --git a/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c b/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c index 6f54ca0fd70..f6acd246dad 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_state_validate.c @@ -425,7 +425,6 @@ static struct state_validate swtnl_validate_list[] = { { nv30_validate_stencil_ref, NV30_NEW_STENCIL_REF }, { nv30_validate_stipple, NV30_NEW_STIPPLE }, { nv30_validate_scissor, NV30_NEW_SCISSOR | NV30_NEW_RASTERIZER }, - { nv30_validate_viewport, NV30_NEW_VIEWPORT }, { nv30_fragprog_validate, NV30_NEW_FRAGPROG | NV30_NEW_FRAGCONST }, { nv30_validate_fragment, NV30_NEW_FRAMEBUFFER | NV30_NEW_FRAGPROG }, { nv30_fragtex_validate, NV30_NEW_FRAGTEX }, |