From: Marek Olšák <marek.olsak@amd.com>
Date: Mon, 25 Jun 2018 22:57:08 +0000 (-0400)
Subject: winsys/amdgpu: remove RADEON_SURF_FMASK leftover
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=565dacc3d6b5036b7c6d4de0b4f5f2eb186b8c93;p=mesa.git

winsys/amdgpu: remove RADEON_SURF_FMASK leftover

RADEON_SURF_FMASK is never set.
---

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
index d5fa37bb6d9..eaf10349355 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_surface.c
@@ -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);
 }