From patchwork Mon Apr 29 16:11:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 16509 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 477BB25E08 for ; Mon, 29 Apr 2013 16:11:18 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q9sf9822744yen.0 for ; Mon, 29 Apr 2013 09:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=osmaPkpRF4n39aPzCiETp49UEZ6fuM5EiiryaRCASns=; b=lG+2FjAYJoTO2796eHaIfz5xrSw45tKGqM9l8GvL26F+LkJt/opXb55MmGJaBvvjbJ vVfEePKoIiWzJOfIkRAOgPa/gxvRqzFviXPXF4tfkLSpcRXFntMUKGnNULzyuhJu5FcQ uOCKOz7whHqfO3m35Y7Asbgvq9pCbpcWhVBdE3tiJ9zynPTHpdF4ZWfoEzHvFFmPWmyx bUEmS4bD8/yR33VtIXS/xhL3J15sRouXJfqKn2Vi8ZI++fZgxq7QJv0Jz4+fI7Maz94K Ck5F90LWk9iEvs2+IpEZ402T1oMRLArvfdgxjiriWpnlqkoJXfn7T561AOQ9hISo/FVw HQ/Q== X-Received: by 10.224.36.66 with SMTP id s2mr7498944qad.6.1367251877266; Mon, 29 Apr 2013 09:11:17 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.230 with SMTP id nj6ls2948112qeb.87.gmail; Mon, 29 Apr 2013 09:11:17 -0700 (PDT) X-Received: by 10.58.188.82 with SMTP id fy18mr21958225vec.41.1367251877040; Mon, 29 Apr 2013 09:11:17 -0700 (PDT) Received: from mail-ve0-x231.google.com (mail-ve0-x231.google.com [2607:f8b0:400c:c01::231]) by mx.google.com with ESMTPS id b4si10068487vdw.57.2013.04.29.09.11.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 09:11:16 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::231; Received: by mail-ve0-f177.google.com with SMTP id cy12so3138192veb.8 for ; Mon, 29 Apr 2013 09:11:16 -0700 (PDT) X-Received: by 10.220.242.73 with SMTP id lh9mr7696042vcb.49.1367251876849; Mon, 29 Apr 2013 09:11:16 -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.58.127.98 with SMTP id nf2csp64609veb; Mon, 29 Apr 2013 09:11:15 -0700 (PDT) X-Received: by 10.180.183.133 with SMTP id em5mr18816273wic.26.1367251875339; Mon, 29 Apr 2013 09:11:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id m16si4418585wij.26.2013.04.29.09.11.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Apr 2013 09:11:15 -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 1UWqfa-0000T6-T4 for ; Mon, 29 Apr 2013 16:11:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CF7FFE013D for ; Mon, 29 Apr 2013 16:11:14 +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: 269 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 269: NativeStateWayland: Apply patch from jbkonno to support resize properly. Message-Id: <20130429161114.1506.31671.launchpad@ackee.canonical.com> Date: Mon, 29 Apr 2013 16:11:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16580"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: b1845d8e1404e1e5f00bbb1de98ddca12e9472e1 X-Gm-Message-State: ALoCoQn+vnJbtw4gJLmTJi6u0IjPlViJ2h5EHAVNaMW3RqaBdXZlVo6hGtAy/f/9qu2wwWwiP8Vi X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::231 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: 269 committer: Jesse Barker branch nick: trunk timestamp: Mon 2013-04-29 09:07:13 -0700 message: NativeStateWayland: Apply patch from jbkonno to support resize properly. modified: src/native-state-wayland.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/native-state-wayland.cpp' --- src/native-state-wayland.cpp 2013-04-04 16:53:33 +0000 +++ src/native-state-wayland.cpp 2013-04-29 16:07:13 +0000 @@ -116,13 +116,17 @@ void NativeStateWayland::output_handle_mode(void *data, struct wl_output * /*wl_output*/, - uint32_t /*flags*/, int32_t width, int32_t height, + uint32_t flags, int32_t width, int32_t height, int32_t refresh) { - struct my_output *my_output = static_cast(data); - my_output->width = width; - my_output->height = height; - my_output->refresh = refresh; + /* Only handle output mode events for the shell's "current" mode */ + if (flags & WL_OUTPUT_MODE_CURRENT) { + struct my_output *my_output = static_cast(data); + + my_output->width = width; + my_output->height = height; + my_output->refresh = refresh; + } } void