gallium/radeon: use the current ctx for DCC decompression in resource_get_handle
authorMarek Olšák <marek.olsak@amd.com>
Sun, 21 Aug 2016 10:30:21 +0000 (12:30 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 5 Sep 2016 16:01:15 +0000 (18:01 +0200)
For coherency with the current context.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeon/r600_texture.c

index fb3068a94d8db9c97765976e566e6de75961e65a..e7be768f571e67877fc282853a4507deaf51a880 100644 (file)
@@ -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;
                }