From d22feeaa9d65126e9775fcbaec8007e349f7fac5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 21 Aug 2016 12:30:21 +0200 Subject: [PATCH] gallium/radeon: use the current ctx for DCC decompression in resource_get_handle MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For coherency with the current context. Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeon/r600_texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index fb3068a94d8..e7be768f571 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -518,8 +518,8 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen, unsigned usage) { struct r600_common_screen *rscreen = (struct r600_common_screen*)screen; - struct r600_common_context *aux_context = - (struct r600_common_context*)rscreen->aux_context; + struct r600_common_context *rctx = (struct r600_common_context*) + (ctx ? ctx : rscreen->aux_context); struct r600_resource *res = (struct r600_resource*)resource; struct r600_texture *rtex = (struct r600_texture*)resource; struct radeon_bo_metadata metadata; @@ -538,7 +538,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen, * access. */ if (usage & PIPE_HANDLE_USAGE_WRITE && rtex->dcc_offset) { - if (r600_texture_disable_dcc(aux_context, rtex)) + if (r600_texture_disable_dcc(rctx, rtex)) update_metadata = true; } -- 2.30.2