debian/0000775000000000000000000000000012016727550007175 5ustar debian/watch0000664000000000000000000000017012014751415010217 0ustar version=3 http://launchpad.net/glmark2/+download http://launchpad.net/glmark2/trunk/.*/\+download/glmark2-(.*)\.tar\.gz debian/rules0000775000000000000000000000107012014751415010246 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS %: dh $@ override_dh_auto_configure: ./waf configure --enable-gl --enable-glesv2 --prefix=/usr override_dh_auto_build: ./waf override_dh_auto_install: ./waf install --destdir=debian/tmp override_dh_auto_clean: ./waf distclean # Clean compiled python code from unpacked waflib/ directory, as # described in http://wiki.debian.org/UnpackWaf . -find waflib -name "*.pyc" -delete debian/glmark2-data.install0000664000000000000000000000002212014751415013020 0ustar usr/share/glmark2 debian/changelog0000664000000000000000000000624312016727550011054 0ustar glmark2 (2012.08-0ubuntu2) quantal; urgency=low * debian/patches/update-handle-api-change-glx_ext_swap_control.patch: - Fixing FTBFS with latest mesa due api change (LP: #1040895) -- Ricardo Salveti de Araujo Sat, 25 Aug 2012 23:35:30 -0300 glmark2 (2012.08-0ubuntu1) quantal; urgency=low * New upstream release 2012.08 (LP: #1039736) - Avoid crashing if gl used is not >= 2.0 (LP: #842279) * Bumping dh compatibility level to v9 * debian/control: - Update Standards-Version to 3.9.3. - Add libjpeg-dev build dependency. - Use libegl1-x11-dev as an build-dep alternative instead of libegl1-dev. - Update description of glmark2-data binary package. * debian/copyright: - Refresh copyright based on the current upstrem version * debian/rules: - Clean compiled python code from unpacked waflib/ directory, as described in http://wiki.debian.org/UnpackWaf -- Ricardo Salveti de Araujo Tue, 21 Aug 2012 15:38:09 -0300 glmark2 (2011.09-0ubuntu1) oneiric; urgency=low * New upstream release 2011.09. * debian/control: - Start the description of the glmark2-data package with a lowercase letter. -- Alexandros Frantzis Thu, 22 Sep 2011 11:32:17 +0300 glmark2 (2011.08-0~linaro1) oneiric; urgency=low * New upstream release 2011.08. * debian/copyright: - Add copyright information for src/libpng. -- Alexandros Frantzis Fri, 19 Aug 2011 00:49:08 +0300 glmark2 (2011.07-0~linaro1) oneiric; urgency=low * New upstream release 2011.07. * debian/copyright: - Use a standalone license paragraph for the GPL3+ license text. -- Alexandros Frantzis Thu, 21 Jul 2011 12:19:15 +0300 glmark2 (2011.06-0~linaro1) oneiric; urgency=low * New upstream release 2011.06. * debian/copyright: - Added copyright information for src/libmatrix/* -- Alexandros Frantzis Fri, 24 Jun 2011 14:54:40 +0300 glmark2 (11.05-0~linaro1) natty; urgency=low * New upstream release 11.05. * debian/control: - Change maintainer to "Alexandros Frantzis". - Update Standards-Version to 3.9.2 - Use python (>= 2.4) as a build-dependency instead of explicitly stating alternative python versions. -- Alexandros Frantzis Mon, 30 May 2011 14:07:36 +0300 glmark2 (11.01-0ubuntu1) natty; urgency=low * New upstream version 11.01 (LP: #707492). * debian/rules: - Use the new --enable-glesv2, --enable-gl configure flags. * debian/copyright: - Update copyright. - Change main source license to GPL-3+ (from GPL-3). * debian/control: - Change maintainer to "Linaro Graphics Working Group". * debian/watch: - Add watch file. -- Alexandros Frantzis Tue, 25 Jan 2011 17:53:50 +0200 glmark2 (10.07.1-0ubuntu1) maverick; urgency=low * Initial release for linaro/maverick (LP: #605901) - see: https://blueprints.launchpad.net/ubuntu/+spec/arm-m-ui-and-test-heads -- Alexandros Frantzis Wed, 28 Jul 2010 18:22:35 +0300 debian/glmark2-es2.install0000664000000000000000000000002412014751415012602 0ustar usr/bin/glmark2-es2 debian/glmark2.manpages0000664000000000000000000000005012014751415012237 0ustar debian/tmp/usr/share/man/man1/glmark2.1 debian/glmark2.install0000664000000000000000000000002012014751415012107 0ustar usr/bin/glmark2 debian/copyright0000664000000000000000000001060412014771512011124 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: glmark2 Upstream-Contact: Alexandros Frantzis Source: https://code.launchpad.net/~glmark2-dev/glmark2/trunk Files: * Copyright: 2008 Ben Smith 2010-2012 Linaro Limited License: GPL-3+ Files: src/scene-ideas* Copyright: 1993 Silicon Graphics, Inc 2012 Linaro Limited License: GPL-3+ Files: src/libmatrix/* Copyright: 2010-2012 Linaro Limited License: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: src/libpng/* Copyright: 1998-2011 Glenn Randers-Pehrson 1996-1997 Andreas Dilger 1995-1996 Guy Eric Schalnat, Group 42, Inc. License: Zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. . 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. . 3. This notice may not be removed or altered from any source distribution. Files: src/libjpeg-turbo/* Copyright: 1991-2010 Thomas G. Lane, Guido Vollbeding 1999-2006 MIYASAKA Masaru 2009 Pierre Ossman for Cendio AB 2009-2012 D. R. Commander 2009-2011 Nokia Corporation and/or its subsidiary(-ies) License: Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for any purpose, without fee, subject to these conditions: . (1) If any part of the source code for this software is distributed, then this README file must be included, with this copyright and no-warranty notice unaltered; and any additions, deletions, or changes to the original files must be clearly indicated in accompanying documentation. . (2) If only executable code is distributed, then the accompanying documentation must state that "this software is based in part on the work of the Independent JPEG Group". . (3) Permission for use of this software is granted only if the user accepts full responsibility for any undesirable consequences; the authors accept NO LIABILITY for damages of any kind. Files: debian/* Copyright: 2010-2012 Linaro License: GPL-3+ License: GPL-3+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . . On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3' debian/compat0000664000000000000000000000000212014753067010373 0ustar 9 debian/source/0000775000000000000000000000000012014751415010470 5ustar debian/source/format0000664000000000000000000000001412014751415011676 0ustar 3.0 (quilt) debian/control0000664000000000000000000000347512014753436010611 0ustar Source: glmark2 Section: misc Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Alexandros Frantzis Build-Depends: debhelper (>= 9), python (>= 2.4), pkg-config, libx11-dev, libjpeg-dev, libpng12-dev, libgl1-mesa-dev | libgl1-dev, libegl1-mesa-dev | libegl1-x11-dev, libgles2-mesa-dev | libgles2-dev Standards-Version: 3.9.3 Homepage: https://launchpad.net/glmark2 Package: glmark2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, glmark2-data (= ${source:Version}) Description: OpenGL (ES) 2.0 benchmark A benchmark for OpenGL (ES) 2.0 that uses only the OpenGL ES 2.0 compatible API. It contains tests for standard OpenGL (ES) 2.0 features, such as vertex arrays, VBOs, texturing and shaders. . This package contains the OpenGL 2.0 variant of the benchmark. Package: glmark2-es2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, glmark2-data (= ${source:Version}) Description: OpenGL (ES) 2.0 benchmark A benchmark for OpenGL (ES) 2.0 that uses only the OpenGL ES 2.0 compatible API. It contains tests for standard OpenGL (ES) 2.0 features, such as vertex arrays, VBOs, texturing and shaders. . This package contains the OpenGL ES 2.0 variant of the benchmark. Package: glmark2-data Architecture: all Depends: ${misc:Depends} Description: data files for the glmark2 OpenGL (ES) 2.0 benchmark A benchmark for OpenGL (ES) 2.0 that uses only the OpenGL ES 2.0 compatible API. It contains tests for standard OpenGL (ES) 2.0 features, such as vertex arrays, VBOs, texturing and shaders. . This package contains the data files used by the glmark2 benchmark. debian/patches/0000775000000000000000000000000012016727550010624 5ustar debian/patches/update-handle-api-change-glx_ext_swap_control.patch0000664000000000000000000000451212016727550022616 0ustar From: Jesse Barker Subject: CanvasX11GLX: Updates to handle the API change for GLX_EXT_swap_control (The spec always had a void return value for glXSwapIntervalEXT, however, the original example and protocol had a return value of int. To make matters worse, the header files in mesa were updated a year after the spec.). Also, make the GLX_MESA_swap_control initialization match the new logic for GLX_EXT_swap_control. Origin: upstream, http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/revision/249 Bug-Ubuntu: http://bugs.launchpad.net/bugs/1040895 diff --git a/src/canvas-x11-glx.cpp b/src/canvas-x11-glx.cpp index 01d71cc..db3ac70 100644 --- a/src/canvas-x11-glx.cpp +++ b/src/canvas-x11-glx.cpp @@ -28,6 +28,7 @@ static PFNGLXSWAPINTERVALEXTPROC glXSwapIntervalEXT_; static PFNGLXSWAPINTERVALMESAPROC glXSwapIntervalMESA_; +static PFNGLXGETSWAPINTERVALMESAPROC glXGetSwapIntervalMESA_; /********************* * Protected methods * @@ -60,12 +61,24 @@ CanvasX11GLX::make_current() return false; } - if ((!glXSwapIntervalEXT_ || glXSwapIntervalEXT_(xdpy_, xwin_, 0)) && - (!glXSwapIntervalMESA_ || glXSwapIntervalMESA_(0))) - { - Log::info("** Failed to set swap interval. Results may be bounded above by refresh rate.\n"); + unsigned int desired_swap(0); + unsigned int actual_swap(-1); + if (glXSwapIntervalEXT_) { + glXSwapIntervalEXT_(xdpy_, xwin_, desired_swap); + glXQueryDrawable(xdpy_, xwin_, GLX_SWAP_INTERVAL_EXT, &actual_swap); + if (actual_swap == desired_swap) + return true; + } + + if (glXSwapIntervalMESA_) { + glXSwapIntervalMESA_(desired_swap); + actual_swap = glXGetSwapIntervalMESA_(); + if (actual_swap == desired_swap) + return true; } + Log::info("** Failed to set swap interval. Results may be bounded above by refresh rate.\n"); + return true; } @@ -131,6 +144,12 @@ CanvasX11GLX::init_extensions() reinterpret_cast("glXSwapIntervalMESA") ) ); + glXGetSwapIntervalMESA_ = + reinterpret_cast( + glXGetProcAddress( + reinterpret_cast("glXGetSwapIntervalMESA") + ) + ); } debian/patches/series0000664000000000000000000000006412016727550012041 0ustar update-handle-api-change-glx_ext_swap_control.patch debian/glmark2-es2.manpages0000664000000000000000000000005412014751415012732 0ustar debian/tmp/usr/share/man/man1/glmark2-es2.1