From patchwork Tue Jul 19 15:13:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 2764 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 DC2B324064 for ; Tue, 19 Jul 2011 15:13:20 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id AAC01A18154 for ; Tue, 19 Jul 2011 15:13:20 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so2976796qwb.11 for ; Tue, 19 Jul 2011 08:13:20 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr6096606qcc.148.1311088400437; Tue, 19 Jul 2011 08:13:20 -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.229.217.78 with SMTP id hl14cs86955qcb; Tue, 19 Jul 2011 08:13:20 -0700 (PDT) Received: by 10.216.188.202 with SMTP id a52mr754434wen.114.1311088398895; Tue, 19 Jul 2011 08:13:18 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id k43si10050006wed.29.2011.07.19.08.13.18; Tue, 19 Jul 2011 08:13:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QjBz3-0003Tw-Q0 for ; Tue, 19 Jul 2011 15:13:18 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id C25672E8030 for ; Tue, 19 Jul 2011 15:13:17 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glcompbench X-Launchpad-Branch: ~glcompbench-dev/glcompbench/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 50 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 50: Use a specific union member when passing a union as an argument to a varargs function. Message-Id: <20110719151317.7684.71183.launchpad@loganberry.canonical.com> Date: Tue, 19 Jul 2011 15:13:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13405"; Instance="initZopeless config overlay" X-Launchpad-Hash: 5256f62d255210035095e2ece6db4b4bc09d8d73 ------------------------------------------------------------ revno: 50 committer: Alexandros Frantzis branch nick: trunk timestamp: Tue 2011-07-19 18:08:44 +0300 message: Use a specific union member when passing a union as an argument to a varargs function. Older compilers can't handle passing union (non-POD) types to varargs functions. modified: src/composite-test-simple-brick.cc src/composite-test-simple-default.cc --- lp:glcompbench https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk You are subscribed to branch lp:glcompbench. To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription === modified file 'src/composite-test-simple-brick.cc' --- src/composite-test-simple-brick.cc 2011-07-15 08:16:54 +0000 +++ src/composite-test-simple-brick.cc 2011-07-19 15:08:44 +0000 @@ -87,7 +87,7 @@ model_view_matrix_name_); Log::debug("Drawing Win: 0x%x Tex: 0x%x\n", - comp_win->get_xwindow(), comp_win->get_texture()); + comp_win->get_xwindow(), comp_win->get_texture().i); glBindTexture(GL_TEXTURE_2D, tex); vboData_.draw(); === modified file 'src/composite-test-simple-default.cc' --- src/composite-test-simple-default.cc 2011-07-15 08:16:54 +0000 +++ src/composite-test-simple-default.cc 2011-07-19 15:08:44 +0000 @@ -68,7 +68,7 @@ model_view_matrix_name_); Log::debug("Drawing Win: 0x%x Tex: 0x%x\n", - comp_win->get_xwindow(), comp_win->get_texture()); + comp_win->get_xwindow(), comp_win->get_texture().i); glBindTexture(GL_TEXTURE_2D, tex); vboData_.draw();