Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek
On Thu, Oct 23, 2014 at 4:06 PM, Andreas Boll <andreas.boll....@gmail.com> wrote: > This reverts commit 01e637114914453451becc0dc8afe60faff48d84. > Since there many Hyper-Z issues have been fixed or worked around. > > Enable Hyper-Z by default so that we get enough feedback for the upcoming > mesa 10.4 release. > > If you have issues with Hyper-Z try to disable Hyper-Z using the enviroment > variable R600_DEBUG=nohyperz and please report the issue on the bugtracker. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75011 > See also: https://bugs.freedesktop.org/show_bug.cgi?id=75112 > > Signed-off-by: Andreas Boll <andreas.boll....@gmail.com> > --- > No piglit regressions on r600g/BARTS. > > src/gallium/drivers/r600/r600_pipe.c | 4 ++-- > src/gallium/drivers/radeon/r600_pipe_common.c | 2 +- > src/gallium/drivers/radeon/r600_pipe_common.h | 2 +- > src/gallium/drivers/radeon/r600_texture.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/src/gallium/drivers/r600/r600_pipe.c > b/src/gallium/drivers/r600/r600_pipe.c > index c794530..c5f01c0 100644 > --- a/src/gallium/drivers/r600/r600_pipe.c > +++ b/src/gallium/drivers/r600/r600_pipe.c > @@ -539,8 +539,8 @@ struct pipe_screen *r600_screen_create(struct > radeon_winsys *ws) > rscreen->b.debug_flags |= DBG_COMPUTE; > if (debug_get_bool_option("R600_DUMP_SHADERS", FALSE)) > rscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | > DBG_CS; > - if (debug_get_bool_option("R600_HYPERZ", FALSE)) > - rscreen->b.debug_flags |= DBG_HYPERZ; > + if (!debug_get_bool_option("R600_HYPERZ", TRUE)) > + rscreen->b.debug_flags |= DBG_NO_HYPERZ; > if (debug_get_bool_option("R600_LLVM", FALSE)) > rscreen->b.debug_flags |= DBG_LLVM; > > diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c > b/src/gallium/drivers/radeon/r600_pipe_common.c > index ae203b6..a6dbd78 100644 > --- a/src/gallium/drivers/radeon/r600_pipe_common.c > +++ b/src/gallium/drivers/radeon/r600_pipe_common.c > @@ -314,7 +314,7 @@ static const struct debug_named_value > common_debug_options[] = { > > /* features */ > { "nodma", DBG_NO_ASYNC_DMA, "Disable asynchronous DMA" }, > - { "hyperz", DBG_HYPERZ, "Enable Hyper-Z" }, > + { "nohyperz", DBG_NO_HYPERZ, "Disable Hyper-Z" }, > /* GL uses the word INVALIDATE, gallium uses the word DISCARD */ > { "noinvalrange", DBG_NO_DISCARD_RANGE, "Disable handling of > INVALIDATE_RANGE map flags" }, > { "no2d", DBG_NO_2D_TILING, "Disable 2D tiling" }, > diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h > b/src/gallium/drivers/radeon/r600_pipe_common.h > index 4651bf8..dfd8fff 100644 > --- a/src/gallium/drivers/radeon/r600_pipe_common.h > +++ b/src/gallium/drivers/radeon/r600_pipe_common.h > @@ -97,7 +97,7 @@ > #define DBG_CS (1 << 9) > /* features */ > #define DBG_NO_ASYNC_DMA (1 << 10) > -#define DBG_HYPERZ (1 << 11) > +#define DBG_NO_HYPERZ (1 << 11) > #define DBG_NO_DISCARD_RANGE (1 << 12) > #define DBG_NO_2D_TILING (1 << 13) > #define DBG_NO_TILING (1 << 14) > diff --git a/src/gallium/drivers/radeon/r600_texture.c > b/src/gallium/drivers/radeon/r600_texture.c > index 1d4e966..fdf4d76 100644 > --- a/src/gallium/drivers/radeon/r600_texture.c > +++ b/src/gallium/drivers/radeon/r600_texture.c > @@ -603,7 +603,7 @@ r600_texture_create_object(struct pipe_screen *screen, > if (rtex->is_depth) { > if (!(base->flags & (R600_RESOURCE_FLAG_TRANSFER | > R600_RESOURCE_FLAG_FLUSHED_DEPTH)) && > - (rscreen->debug_flags & DBG_HYPERZ)) { > + !(rscreen->debug_flags & DBG_NO_HYPERZ)) { > > r600_texture_allocate_htile(rscreen, rtex); > } > -- > 2.1.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
