winsys/amdgpu: remove RADEON_SURF_FMASK leftover
authorMarek Olšák <marek.olsak@amd.com>
Mon, 25 Jun 2018 22:57:08 +0000 (18:57 -0400)
committerMarek Olšák <marek.olsak@amd.com>
Thu, 19 Jul 2018 04:58:51 +0000 (00:58 -0400)
RADEON_SURF_FMASK is never set.

src/gallium/winsys/amdgpu/drm/amdgpu_surface.c

index d5fa37bb6d916f032473e0c7299f699dd7d804fc..eaf103493552e3d275c02f73c8ec43a5d201fc92 100644 (file)
@@ -96,15 +96,12 @@ static int amdgpu_surface_init(struct radeon_winsys *rws,
     * always use consecutive surface indices when FMASK is allocated between
     * them.
     */
-   if (flags & RADEON_SURF_FMASK)
-      config.info.surf_index = &ws->surf_index_fmask;
-   else if (!(flags & RADEON_SURF_Z_OR_SBUFFER))
-      config.info.surf_index = &ws->surf_index_color;
-   else
-      config.info.surf_index = NULL;
-
+   config.info.surf_index = &ws->surf_index_color;
    config.info.fmask_surf_index = &ws->surf_index_fmask;
 
+   if (flags & RADEON_SURF_Z_OR_SBUFFER)
+      config.info.surf_index = NULL;
+
    return ac_compute_surface(ws->addrlib, &ws->info, &config, mode, surf);
 }