From patchwork Thu Oct 17 15:00:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 21098 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5243E25B8B for ; Thu, 17 Oct 2013 15:00:40 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id x19sf3962123qcw.0 for ; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=DJcRLLVTHYBlNbjLE1pqfKG7fOWYqD5NhxB81zNUBS0=; b=W2ROY6g1pG2xpLLT0Rj9h2GllVXg6cU4KZ7TRhfefErHpp8+bBzgs7+fr2pCj1XQKf 5L/etB04SB+XpyZINJO+v/sRrJ3scTd7IAD3bVBEmphHektvGekCSFsb5BGmsP+V7UYB B2c9g1EE29hixKE5FYOSR0GLmj+x5ELMhp3I0keLsNOoZzo1lCHSfHfHRAcou1ip1Si+ n3leJfAkxG//xa4AWkyjZIWqj5UtpeKDBXFDj6ui18MOf/kLOXfLk260o1+8dWWD1LUx aPCgCJdPsZFxaZ9KXH0WjHFQu9B5L+HT3e6b7jrL+Bl/Kx7z8MWfkCLsXYK+tQhKDDNb Kb8w== X-Received: by 10.58.88.2 with SMTP id bc2mr661027veb.37.1382022039567; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.109.226 with SMTP id hv2ls901371qeb.22.gmail; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) X-Received: by 10.220.74.69 with SMTP id t5mr7145352vcj.18.1382022039440; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id ge8si6932310vec.105.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Oct 2013 08:00:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id f12so1157227vbg.39 for ; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) X-Gm-Message-State: ALoCoQlv1X515JRBRyiobKGpxovxHXZvFgMsQMMdxqr1B7DYfWEJuUflbwq5++kRYq6MwAlsO01n X-Received: by 10.52.35.136 with SMTP id h8mr5791916vdj.6.1382022039297; Thu, 17 Oct 2013 08:00:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp126749vcz; Thu, 17 Oct 2013 08:00:38 -0700 (PDT) X-Received: by 10.224.32.133 with SMTP id c5mr12914578qad.84.1382022038528; Thu, 17 Oct 2013 08:00:38 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id i8si30915880qeh.45.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Oct 2013 08:00:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VWp41-0002XF-4f for ; Thu, 17 Oct 2013 15:00:37 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 0B124E000F for ; Thu, 17 Oct 2013 15:00:37 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 284 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 284: CanvasGeneric: fix inverted checks for destroying renderbuffers. Message-Id: <20131017150037.16826.28595.launchpad@ackee.canonical.com> Date: Thu, 17 Oct 2013 15:00:37 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16799"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 578b79f8bb92a24875c8b563b0148aaad677229e X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ------------------------------------------------------------ revno: 284 committer: Jesse Barker branch nick: trunk timestamp: Thu 2013-10-17 07:59:00 -0700 message: CanvasGeneric: fix inverted checks for destroying renderbuffers. modified: src/canvas-generic.cpp --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'src/canvas-generic.cpp' --- src/canvas-generic.cpp 2013-06-11 22:40:02 +0000 +++ src/canvas-generic.cpp 2013-10-17 14:59:00 +0000 @@ -413,11 +413,11 @@ glDeleteFramebuffers(1, &fbo_); fbo_ = 0; } - if (!color_renderbuffer_) { + if (color_renderbuffer_) { glDeleteRenderbuffers(1, &color_renderbuffer_); color_renderbuffer_ = 0; } - if (!depth_renderbuffer_) { + if (depth_renderbuffer_) { glDeleteRenderbuffers(1, &depth_renderbuffer_); depth_renderbuffer_ = 0; }