diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-08-12 21:40:52 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-08-14 17:41:49 -0400 |
| commit | 5c1ccd8053412b6a42098481d2fde3d483208c33 (patch) | |
| tree | 7a654b2b061d38b555fdecfa60ba5fa144c7ef2d /src/gallium/drivers/nouveau/nvc0 | |
| parent | c85b7f0e873518c332d23d1492332941355cb600 (diff) | |
| download | external_mesa3d-5c1ccd8053412b6a42098481d2fde3d483208c33.zip external_mesa3d-5c1ccd8053412b6a42098481d2fde3d483208c33.tar.gz external_mesa3d-5c1ccd8053412b6a42098481d2fde3d483208c33.tar.bz2 | |
nv50,nvc0: fix depth range when halfz is enabled
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97231
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/gallium/drivers/nouveau/nvc0')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c index 160abae..e69463e 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c @@ -2,6 +2,7 @@ #include "util/u_format.h" #include "util/u_framebuffer.h" #include "util/u_math.h" +#include "util/u_viewport.h" #include "nvc0/nvc0_context.h" @@ -329,8 +330,12 @@ nvc0_validate_viewport(struct nvc0_context *nvc0) PUSH_DATA (push, (w << 16) | x); PUSH_DATA (push, (h << 16) | y); - zmin = vp->translate[2] - fabsf(vp->scale[2]); - zmax = vp->translate[2] + fabsf(vp->scale[2]); + /* If the halfz setting ever changes, the viewports will also get + * updated. The rast will get updated before the validate function has a + * chance to hit, so we can just use it directly without an atom + * dependency. + */ + util_viewport_zmin_zmax(vp, nvc0->rast->pipe.clip_halfz, &zmin, &zmax); BEGIN_NVC0(push, NVC0_3D(DEPTH_RANGE_NEAR(i)), 2); PUSH_DATAf(push, zmin); |