glmark2 for Mir

[Daniel van Vugt]

I'm not yet convinced that the offending API change is exactly in a form 
that we want to keep. So please hold off changing glmark2 to suit.

...or if you do change glmark2 then just beware you might have to change 
it again later.


On 08/04/13 04:55, Thomi Richards wrote:
> Hi,
>
> On 02/04/13 20:58, Alexandros Frantzis wrote:
>> There was a mix-up with the branches. Now lp:~mir-team/glmark2/mir
>> contains the latest version.
>
> This branch fails to build this morning:
>
> [ 56/124] cxx: src/native-state-mir.cpp -> build/src/native-state-mir.cpp.1.o
> ../src/native-state-mir.cpp: In member function 'virtual bool NativeStateMir::create_window(const NativeState::WindowProperties&)':
> ../src/native-state-mir.cpp:112:80: error: too few arguments to function 'MirSurface* mir_surface_create_sync(MirConnection*, const MirSurfaceParameters*, const MirEventDelegate*)'
> In file included from ../src/native-state-mir.h:26:0,
>                   from ../src/native-state-mir.cpp:22:
> /usr/include/mirclient/mir_toolkit/mir_client_library.h:141:13: note: declared here
> Waf: Leaving directory `/build/buildd/glmark2-2012.08+268+17~quantal1/build'
> Build failed
>   -> task in 'glmark2-mir' failed (exit status 1):
> 	{task 1439278220: cxx native-state-mir.cpp -> native-state-mir.cpp.1.o}
> ['/usr/bin/g++', '-g', '-O2', '-D_FORTIFY_SOURCE=2', '-g', '-O2', '-fstack-protector', '--param=ssp-buffer-size=4', '-Wformat', '-Werror=format-security', '-Werror', '-Wall', '-Wextra', '-Wnon-virtual-dtor', '-pthread', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/build/src', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/src', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/build/src/scene-ideas', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/src/scene-ideas', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/build/src/scene-terrain', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/src/scene-terrain', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/build/src/libmatrix', '-I/build/buildd/glmark2-2012.08+268+17~quantal1/src/libmatrix', '-I/usr/include/libpng12', '-I/usr/include/mirclient', '-I/usr/include/mircommon', '-I/usr/include/libdrm', '-DHAVE_STDLIB_H=1', '-DHAVE_STRING_H=1', '-DHAVE_UNISTD_H=1', '-DHAVE_STDINT_H=1', '-DHAVE_STDIO_H=1', '-DHAVE_JPEGLIB_H=1', '-DHAVE
_MEMSET=1', '-DHAVE_SQRT=1', '-DHAVE_LIBPNG12=1', '-DHAVE_X11=1', '-DHAVE_GL=1', '-DHAVE_EGL=1', '-DHAVE_GLESV2=1', '-DHAVE_DRM=1', '-DHAVE_MIRCLIENT=1', '-DGLMARK_DATA_PATH="/usr/share/glmark2"', '-DGLMARK_VERSION="2012.12"', '-DUSE_EXCEPTIONS', '-DGLMARK2_USE_MIR', '-DGLMARK2_USE_GL', '-DGLMARK2_USE_EGL', '../src/native-state-mir.cpp', '-c', '-o', 'src/native-state-mir.cpp.1.o']
>
>
> When you get a moment could you please update that branch and let me
> know when I can try the build again?
>
>
> Cheers,
>
>
>