Module: Mesa Branch: master Commit: 7b25f52a95fe13bfc86c4d421328f6df7690876c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b25f52a95fe13bfc86c4d421328f6df7690876c
Author: Marek Olšák <[email protected]> Date: Mon Sep 30 12:57:51 2013 +0200 r600g,radeonsi: workaround for late shared screen initialization Accidentally broken by the consolidation. --- src/gallium/drivers/r600/r600_pipe.c | 4 +++- src/gallium/drivers/radeonsi/radeonsi_pipe.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 097a6b8..6b31bd8 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -1018,6 +1018,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) return NULL; } + ws->query_info(ws, &rscreen->b.info); + /* Set functions first. */ rscreen->b.b.context_create = r600_create_context; rscreen->b.b.destroy = r600_destroy_screen; @@ -1028,7 +1030,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws) rscreen->b.b.get_paramf = r600_get_paramf; rscreen->b.b.get_compute_param = r600_get_compute_param; rscreen->b.b.get_timestamp = r600_get_timestamp; - if (rscreen->b.chip_class >= EVERGREEN) { + if (rscreen->b.info.chip_class >= EVERGREEN) { rscreen->b.b.is_format_supported = evergreen_is_format_supported; } else { rscreen->b.b.is_format_supported = r600_is_format_supported; diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 5016e13..a929270 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -765,6 +765,8 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) return NULL; } + ws->query_info(ws, &rscreen->b.info); + /* Set functions first. */ rscreen->b.b.context_create = r600_create_context; rscreen->b.b.destroy = r600_destroy_screen; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
