From patchwork Sun Jul 29 14:02:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 1252271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 26447DF25A for ; Sun, 29 Jul 2012 14:02:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6A619F035 for ; Sun, 29 Jul 2012 07:02:28 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 94B869E81F for ; Sun, 29 Jul 2012 07:02:13 -0700 (PDT) Received: by wibhm2 with SMTP id hm2so1789839wib.0 for ; Sun, 29 Jul 2012 07:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=LwNmW/uF6q/vm9acLyMM1N8wuUEl33YaFzEg4NzKaVw=; b=xX57aFkAdV52YWjWcouSsl3mc/hwn+tY0e1NszmaL9C+WxW/9zD6/L3jd0iiemK5qa TSdRnyPEW2mi4KbIK4z3Qu2tLwkPqNt/drdQPoyfVogF8OKvj/CZXvRGbAM9gZTL+0Xf ZDneKQkgDFUp/It5blxaRaDarDixbKFvFmJVHzp1kvS3wbNr748p64uRriyhNt13K0kz x3kK4s9Fb+2avMu7k3rw4RIjVnx15FLBewen8fABeIMpaLb+DNoysja5LIwUWgen+Sbu gwR/5kohtEYl5lMOhHlT7UYkUOJLsFIw/+wA52MnazM1rV7v94EmtGCULAahvvt1IOen xapw== Received: by 10.180.86.133 with SMTP id p5mr19476107wiz.17.1343570532577; Sun, 29 Jul 2012 07:02:12 -0700 (PDT) Received: from localhost.localdomain (static-84-242-70-218.net.upcbroadband.cz. [84.242.70.218]) by mx.google.com with ESMTPS id bc2sm15776027wib.0.2012.07.29.07.02.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 Jul 2012 07:02:11 -0700 (PDT) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] radeon: simplify ZS buffer checking on r600 Date: Sun, 29 Jul 2012 16:02:01 +0200 Message-Id: <1343570522-4080-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Setting those flags has no effect anywhere else. Reviewed-by: Christian König --- radeon/radeon_surface.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c index c80f7f4..5800c33 100644 --- a/radeon/radeon_surface.c +++ b/radeon/radeon_surface.c @@ -385,14 +385,7 @@ static int r6_surface_init(struct radeon_surface_manager *surf_man, /* tiling mode */ mode = (surf->flags >> RADEON_SURF_MODE_SHIFT) & RADEON_SURF_MODE_MASK; - /* always enable z & stencil together */ - if (surf->flags & RADEON_SURF_ZBUFFER) { - surf->flags |= RADEON_SURF_SBUFFER; - } - if (surf->flags & RADEON_SURF_SBUFFER) { - surf->flags |= RADEON_SURF_ZBUFFER; - } - if (surf->flags & RADEON_SURF_ZBUFFER) { + if (surf->flags & (RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER)) { /* zbuffer only support 1D or 2D tiled surface */ switch (mode) { case RADEON_SURF_MODE_1D: