Module: Mesa Branch: master Commit: 393d741788fa82896d4b1c9fd02402a83053afcf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=393d741788fa82896d4b1c9fd02402a83053afcf
Author: Marek Olšák <[email protected]> Date: Tue Mar 27 21:00:49 2012 +0200 r600g: enable transform feedback on everything that isn't r700 Use R700_STREAMOUT=1 if you wanna hack transform feedback on r700. --- src/gallium/drivers/r600/r600_pipe.c | 6 ++++++ src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 8daa67a..580b9c1 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -814,6 +814,12 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) rscreen->chip_class = R600; } + /* XXX streamout is broken on r700 */ + if (rscreen->chip_class == R700 && + !debug_get_bool_option("R700_STREAMOUT", FALSE)) { + rscreen->info.r600_has_streamout = false; + } + if (r600_init_tiling(rscreen)) { FREE(rscreen); return NULL; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 956fe85..c29dca3 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -290,8 +290,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) ws->info.r600_virtual_address = FALSE; } - /* XXX don't enable this for R700 yet, it's broken on those asics */ - ws->info.r600_has_streamout = debug_get_bool_option("R600_STREAMOUT", FALSE); + ws->info.r600_has_streamout = ws->info.drm_minor >= 13; } return TRUE; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
