From 565dacc3d6b5036b7c6d4de0b4f5f2eb186b8c93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 25 Jun 2018 18:57:08 -0400 Subject: [PATCH] winsys/amdgpu: remove RADEON_SURF_FMASK leftover RADEON_SURF_FMASK is never set. --- src/gallium/winsys/amdgpu/drm/amdgpu_surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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); } -- 2.30.2