From patchwork Tue Sep 13 16:33:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 4049 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4D4D223EF8 for ; Tue, 13 Sep 2011 16:33:15 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3D68BA18090 for ; Tue, 13 Sep 2011 16:33:15 +0000 (UTC) Received: by fxe23 with SMTP id 23so995560fxe.11 for ; Tue, 13 Sep 2011 09:33:15 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr226779fah.84.1315931594996; Tue, 13 Sep 2011 09:33:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs14686lab; Tue, 13 Sep 2011 09:33:14 -0700 (PDT) Received: by 10.227.19.213 with SMTP id c21mr2634527wbb.5.1315931593997; Tue, 13 Sep 2011 09:33:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fn2si1060650wbb.14.2011.09.13.09.33.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Sep 2011 09:33:13 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1R3Vv7-00055m-GD for ; Tue, 13 Sep 2011 16:33:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 6A3AAE032C for ; Tue, 13 Sep 2011 16:33:13 +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: 131 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 131: Only delete textures/framebuffers if they were gen'd in the first place. Mesa Message-Id: <20110913163313.22571.15902.launchpad@ackee.canonical.com> Date: Tue, 13 Sep 2011 16:33:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13921"; Instance="initZopeless config overlay" X-Launchpad-Hash: e8eb2dd080afd7302f6ee5465338916e7943abcb ------------------------------------------------------------ revno: 131 committer: Jesse Barker branch nick: trunk timestamp: Tue 2011-09-13 09:31:11 -0700 message: Only delete textures/framebuffers if they were gen'd in the first place. Mesa GLESv2 implementation was segfaulting based upon this. modified: src/scene-desktop.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/scene-desktop.cpp' --- src/scene-desktop.cpp 2011-09-13 09:36:32 +0000 +++ src/scene-desktop.cpp 2011-09-13 16:31:11 +0000 @@ -141,10 +141,16 @@ virtual void release() { /* Release resources */ - glDeleteTextures(1, &texture_); - glDeleteFramebuffers(1, &fbo_); - texture_ = 0; - fbo_ = 0; + if (texture_ != 0) + { + glDeleteTextures(1, &texture_); + texture_ = 0; + } + if (fbo_ != 0) + { + glDeleteFramebuffers(1, &fbo_); + fbo_ = 0; + } /* * Release the shader program when object of this class