From patchwork Wed Aug 7 18:09:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 18841 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9800B246B3 for ; Wed, 7 Aug 2013 18:09:26 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id o19sf2900819qap.3 for ; Wed, 07 Aug 2013 11:09:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; 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=7fXEuwd/3YzOKuolr8W3HgVfG/s/Up0XKXV0feeJ8gY=; b=EiDhb9wmWeSh7Y5OCsPgnRnn7s6HDnPKkk69FXxhsg1cHnxNytFBAGOKFnmTPR8MxV oUl11QNBfnfC9VRtwu6+7V4xF8CcSTEAfWdlOYHeIjv3FjCcCAM6FNEBQYilKARuwNTA 8WI0sHo8tGWj8ERQmfx26RC/doAwhHruXCVllcNRdxR/YpUiwHZkBgi5WRSApXm5MT/z zDFL5p/o3DJsVBESozBD34UVp6M/LRm+uCxhheS0UXFHVfEFhoL4JSZXitNmEH7/PaFf BsXWoElYBxmgp8RIuemjhLFnUyVIz8LxT2r0HlwlHJ62ofUwyq2iaFj2AwtWLrBoTglX UP5A== X-Received: by 10.236.74.169 with SMTP id x29mr1857226yhd.34.1375898966376; Wed, 07 Aug 2013 11:09:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.9 with SMTP id do9ls731609qeb.80.gmail; Wed, 07 Aug 2013 11:09:26 -0700 (PDT) X-Received: by 10.220.205.67 with SMTP id fp3mr2026902vcb.43.1375898966256; Wed, 07 Aug 2013 11:09:26 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id qu17si1944520vec.82.2013.08.07.11.09.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Aug 2013 11:09:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id pb11so2202920veb.11 for ; Wed, 07 Aug 2013 11:09:26 -0700 (PDT) X-Gm-Message-State: ALoCoQmgMDDQybUTsvLsM01T+dskG5sQth0EW+8CqT9iRWXt3bNieaxw60aLWxR+qIuCDPo04x3X X-Received: by 10.220.164.138 with SMTP id e10mr2013730vcy.27.1375898966117; Wed, 07 Aug 2013 11:09:26 -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.221.11.8 with SMTP id pc8csp214103vcb; Wed, 7 Aug 2013 11:09:25 -0700 (PDT) X-Received: by 10.15.34.65 with SMTP id d41mr4325393eev.45.1375898964280; Wed, 07 Aug 2013 11:09:24 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id c3si7135342eeb.332.2013.08.07.11.09.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 07 Aug 2013 11:09:24 -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 1V78Al-0007Ul-MZ for ; Wed, 07 Aug 2013 18:09:23 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 9BCB9E0052 for ; Wed, 7 Aug 2013 18:09:23 +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: 280 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 280: Fix for bug 1208996. Merged from lp:~jbkonno/+junk/glmark2/revision/279. Message-Id: <20130807180923.30329.786.launchpad@ackee.canonical.com> Date: Wed, 07 Aug 2013 18:09:23 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16721"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 28e399c8490be90cce6beff9f7de426e734b747c 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.128.180 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: , Merge authors: Joe Konno (jbkonno) ------------------------------------------------------------ revno: 280 [merge] committer: Jesse Barker branch nick: trunk timestamp: Wed 2013-08-07 11:06:45 -0700 message: Fix for bug 1208996. Merged from lp:~jbkonno/+junk/glmark2/revision/279. Add stub methods for new Wayland output events. modified: src/native-state-wayland.cpp src/native-state-wayland.h --- 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-06-21 18:40:26 +0000 +++ src/native-state-wayland.cpp 2013-08-06 22:18:53 +0000 @@ -38,7 +38,9 @@ const struct wl_output_listener NativeStateWayland::output_listener_ = { NativeStateWayland::output_handle_geometry, - NativeStateWayland::output_handle_mode + NativeStateWayland::output_handle_mode, + NativeStateWayland::output_handle_done, + NativeStateWayland::output_handle_scale }; volatile bool NativeStateWayland::should_quit_ = false; @@ -103,7 +105,7 @@ my_output->output = static_cast( wl_registry_bind(registry, - id, &wl_output_interface, 1)); + id, &wl_output_interface, 2)); that->display_->outputs.push_back(my_output); wl_output_add_listener(my_output->output, &output_listener_, my_output); @@ -143,6 +145,17 @@ } void +NativeStateWayland::output_handle_done(void * /*data*/, struct wl_output * /*wl_output*/) +{ +} + +void +NativeStateWayland::output_handle_scale(void * /*data*/, struct wl_output * /*wl_output*/, + int32_t /*factor*/) +{ +} + +void NativeStateWayland::shell_surface_handle_ping(void * /*data*/, struct wl_shell_surface *shell_surface, uint32_t serial) { === modified file 'src/native-state-wayland.h' --- src/native-state-wayland.h 2013-04-08 18:58:52 +0000 +++ src/native-state-wayland.h 2013-08-06 22:18:53 +0000 @@ -70,6 +70,12 @@ int32_t width, int32_t height, int32_t refresh); static void + output_handle_done(void *data, struct wl_output *wl_output); + + static void + output_handle_scale(void *data, struct wl_output *wl_output, int32_t factor); + + static void shell_surface_handle_ping(void *data, struct wl_shell_surface *shell_surface, uint32_t serial); static void