Merge lp:~spenser-gilliland/glmark2/mali-fbdev into lp:glmark2/2011.11

[Spenser Gilliland]

These changes add mali support to glmark2.

Unmerged revisions

282. By Spenser Gilliland on 2013-08-29

add Mali GPU support

281. By Spenser Gilliland on 2013-08-29

do not require gl if using gles version

280. By Spenser Gilliland on 2013-08-29

GLchar not defined change to char

279. By Wladimir J. van der Laan on 2013-07-20

Add fbdev-glesv2 flavor

This exercises Mesa with the EGL 'fbdev' platform.

=== modified file 'src/gl-state-egl.cpp'
--- src/gl-state-egl.cpp	2013-03-04 19:07:07 +0000
+++ src/gl-state-egl.cpp	2013-08-29 17:40:29 +0000
@@ -414,9 +414,12 @@
 {
     if (egl_display_)
         return true;
-
+#ifdef HAS_MALI
+    egl_display_ = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+#else
     egl_display_ = eglGetDisplay(native_display_);
-    if (!egl_display_) {
+#endif
+    if (egl_display_ == EGL_NO_DISPLAY) {
         Log::error("eglGetDisplay() failed with error: 0x%x\n", eglGetError());
         return false;
     }
 
=== modified file 'src/libmatrix/program.cc'
--- src/libmatrix/program.cc	2012-04-30 16:31:04 +0000
+++ src/libmatrix/program.cc	2013-08-29 17:40:29 +0000
@@ -17,6 +17,8 @@
 #include "gl-if.h"
 #include "program.h"
 
+typedef char GLchar;
+
 using std::string;
 using LibMatrix::mat4;
 using LibMatrix::mat3;
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2013-06-21 18:46:01 +0000
+++ src/main.cpp	2013-08-29 17:40:29 +0000
@@ -42,6 +42,8 @@
 #include "native-state-mir.h"
 #elif GLMARK2_USE_WAYLAND
 #include "native-state-wayland.h"
+#elif GLMARK2_USE_FBDEV
+#include "native-state-fbdev.h"
 #endif
 
 #if GLMARK2_USE_EGL
@@ -168,6 +170,8 @@
     NativeStateMir native_state;
 #elif GLMARK2_USE_WAYLAND
     NativeStateWayland native_state;
+#elif GLMARK2_USE_FBDEV
+    NativeStateFBDEV native_state;
 #endif
 
 #if GLMARK2_USE_EGL
 
=== added file 'src/native-state-fbdev.cpp'
--- src/native-state-fbdev.cpp	1970-01-01 00:00:00 +0000
+++ src/native-state-fbdev.cpp	2013-08-29 17:40:29 +0000
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ * Copyright © 2013 Canonical Ltd
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 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.
+ *
+ * glmark2 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
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Simon Que 
+ *  Jesse Barker
+ *  Alexandros Frantzis
+ *  Wladimir J. van der Laan
+ */
+#include "native-state-fbdev.h"
+#include "log.h"
+#include "util.h"
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/fb.h>
+#if HAS_MALI
+#include <EGL/egl.h>
+#endif
+#ifdef ANDROID
+#define FBDEV_DEV "/dev/graphics/fb"
+#else
+#define FBDEV_DEV "/dev/fb"
+#endif
+
+/******************
+ * Public methods *
+ ******************/
+
+bool
+NativeStateFBDEV::init_display()
+{
+    if (fd == -1)
+        return init();
+    return true;
+}
+
+void*
+NativeStateFBDEV::display()
+{
+    return reinterpret_cast<void*>(fd);
+}
+
+bool
+NativeStateFBDEV::create_window(WindowProperties const& /*properties*/)
+{
+    struct fb_var_screeninfo fb_var;
+    if (fd == -1) {
+        Log::error("Error: display has not been initialized!\n");
+        return false;
+    }
+    if (ioctl(fd, FBIOGET_VSCREENINFO, &fb_var))
+    {
+        Log::error("Error: cannot get variable frame buffer info\n");
+        return false;
+    }
+    winprops.width = fb_var.xres;
+    winprops.height = fb_var.yres;
+    winprops.fullscreen = true;
+    return true;
+}
+
+void*
+NativeStateFBDEV::window(WindowProperties& properties)
+{
+    properties = winprops;
+#ifdef HAS_MALI
+    native_window.height = winprops.height;
+    native_window.width = winprops.width;
+    return reinterpret_cast<void*>(&native_window);
+#else
+    return NULL;
+#endif
+}
+
+void
+NativeStateFBDEV::visible(bool /*visible*/)
+{
+}
+
+bool
+NativeStateFBDEV::should_quit()
+{
+    return should_quit_;
+}
+
+void
+NativeStateFBDEV::flip()
+{
+}
+
+/*******************
+ * Private methods *
+ *******************/
+
+bool
+NativeStateFBDEV::init()
+{
+    std::string devname;
+    int num = 0; /* always fb0 for now */
+
+    devname = std::string(FBDEV_DEV) + Util::toString(num);
+    fd = open(devname.c_str(), O_RDWR);
+    if(fd == -1)
+    {
+        Log::error("Error: Cannot open framebuffer device %s\n", devname.c_str());
+        return false;
+    }
+
+    signal(SIGINT, &NativeStateFBDEV::quit_handler);
+
+    return true;
+}
+
+volatile std::sig_atomic_t NativeStateFBDEV::should_quit_(false);
+
+void
+NativeStateFBDEV::quit_handler(int /*signo*/)
+{
+    should_quit_ = true;
+}
+
+void
+NativeStateFBDEV::cleanup()
+{
+    close(fd);
+    fd = -1;
+}
 
=== added file 'src/native-state-fbdev.h'
--- src/native-state-fbdev.h	1970-01-01 00:00:00 +0000
+++ src/native-state-fbdev.h	2013-08-29 17:40:29 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2012 Linaro Limited
+ * Copyright © 2013 Canonical Ltd
+ *
+ * This file is part of the glmark2 OpenGL (ES) 2.0 benchmark.
+ *
+ * glmark2 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.
+ *
+ * glmark2 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
+ * glmark2.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Simon Que 
+ *  Jesse Barker
+ *  Alexandros Frantzis
+ *  Wladimir J. van der Laan
+ */
+#ifndef GLMARK2_NATIVE_STATE_FBDEV_H_
+#define GLMARK2_NATIVE_STATE_FBDEV_H_
+
+#include "native-state.h"
+#include <csignal>
+#include <cstring>
+
+#ifdef HAS_MALI
+#include <EGL/egl.h>
+#endif
+
+class NativeStateFBDEV : public NativeState
+{
+public:
+    NativeStateFBDEV() :
+        fd(-1) {}
+    ~NativeStateFBDEV() { cleanup(); }
+
+    bool init_display();
+    void* display();
+    bool create_window(WindowProperties const& properties);
+    void* window(WindowProperties& properties);
+    void visible(bool v);
+    bool should_quit();
+    void flip();
+
+private:
+    static void quit_handler(int signum);
+    static volatile std::sig_atomic_t should_quit_;
+    int fd;
+    WindowProperties winprops;
+#ifdef HAS_MALI
+    struct mali_native_window native_window;
+#endif
+    bool init();
+    void cleanup();
+};
+
+#endif /* GLMARK2_NATIVE_STATE_FBDEV_H_ */
 
=== modified file 'src/wscript_build'
--- src/wscript_build	2013-05-05 16:23:53 +0000
+++ src/wscript_build	2013-08-29 17:40:29 +0000
@@ -16,17 +16,20 @@
   'mir-gl' : ['canvas-generic.cpp', 'native-state-mir.cpp', 'gl-state-egl.cpp'],
   'mir-glesv2' : ['canvas-generic.cpp', 'native-state-mir.cpp', 'gl-state-egl.cpp'],
   'wayland-gl' : ['canvas-generic.cpp', 'native-state-wayland.cpp', 'gl-state-egl.cpp'],
-  'wayland-glesv2' : ['canvas-generic.cpp', 'native-state-wayland.cpp', 'gl-state-egl.cpp']
+  'wayland-glesv2' : ['canvas-generic.cpp', 'native-state-wayland.cpp', 'gl-state-egl.cpp'],
+  'fbdev-glesv2' : ['canvas-generic.cpp', 'native-state-fbdev.cpp', 'gl-state-egl.cpp']
 }
 flavor_uselibs = {
   'x11-gl' : ['x11', 'gl', 'matrix-gl'],
   'x11-glesv2' : ['x11', 'egl', 'glesv2', 'matrix-glesv2'],
   'drm-gl' : ['drm', 'gbm', 'egl', 'gl', 'matrix-gl'],
-  'drm-glesv2' : ['drm', 'gbm', 'egl', 'glesv2', 'matrix-gl'],
+  'drm-glesv2' : ['drm', 'gbm', 'egl', 'glesv2', 'matrix-glesv2'],
   'mir-gl' : ['mirclient', 'egl', 'gl', 'matrix-gl'],
-  'mir-glesv2' : ['mirclient', 'egl', 'glesv2', 'matrix-gl'],
+  'mir-glesv2' : ['mirclient', 'egl', 'glesv2', 'matrix-glesv2'],
   'wayland-gl' : ['wayland-client', 'wayland-egl', 'egl', 'gl', 'matrix-gl'],
-  'wayland-glesv2' : ['wayland-client', 'wayland-egl', 'egl', 'glesv2', 'matrix-gl']
+  'wayland-glesv2' : ['wayland-client', 'wayland-egl', 'egl', 'glesv2',
+  'matrix-glesv2'],
+  'fbdev-glesv2' : ['egl', 'glesv2', 'matrix-glesv2']
 }
 flavor_defines = {
   'x11-gl' : ['GLMARK2_USE_X11', 'GLMARK2_USE_GL', 'GLMARK2_USE_GLX'],
@@ -36,7 +39,8 @@
   'mir-gl' : ['GLMARK2_USE_MIR', 'GLMARK2_USE_GL', 'GLMARK2_USE_EGL'],
   'mir-glesv2' : ['GLMARK2_USE_MIR', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'],
   'wayland-gl' : ['GLMARK2_USE_WAYLAND', 'GLMARK2_USE_GL', 'GLMARK2_USE_EGL'],
-  'wayland-glesv2' : ['GLMARK2_USE_WAYLAND', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL']
+  'wayland-glesv2' : ['GLMARK2_USE_WAYLAND', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'],
+  'fbdev-glesv2' : ['GLMARK2_USE_FBDEV', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL', 'MESA_EGL_NO_X11_HEADERS']
 }
 
 includes = ['.', 'scene-ideas', 'scene-terrain']
@@ -74,6 +78,7 @@
         features = ['cxx', 'cxxstlib'],
         source   = libmatrix_sources,
         target   = 'matrix-glesv2',
+        use      = ['glesv2'], # for gles header
         lib      = ['m'],
         includes = ['.'],
         export_includes = 'libmatrix',
 
=== modified file 'wscript'
--- wscript	2013-05-05 16:23:53 +0000
+++ wscript	2013-08-29 17:40:29 +0000
@@ -19,7 +19,8 @@
     'mir-gl' : 'glmark2-mir',
     'mir-glesv2' : 'glmark2-es2-mir',
     'wayland-gl' : 'glmark2-wayland',
-    'wayland-glesv2' : 'glmark2-es2-wayland'
+    'wayland-glesv2' : 'glmark2-es2-wayland',
+    'fbdev-glesv2' : 'glmark2-es2'
 }
 FLAVORS_STR = ", ".join(FLAVORS.keys())
 
@@ -45,7 +46,8 @@
                    dest = 'flavors',
                    help = "a list of flavors to build (%s, all)" % FLAVORS_STR)
     opt.parser.set_default('flavors', [])
-
+    opt.add_option('--for-mali', action='store_true', dest = 'mali',
+                   default = False, help='enable ARM Mali GPU support')
     opt.add_option('--no-debug', action='store_false', dest = 'debug',
                    default = True, help='disable compiler debug information')
     opt.add_option('--no-opt', action='store_false', dest = 'opt',
@@ -131,6 +133,8 @@
         ctx.env.prepend_value('CXXFLAGS', '-O2')
     if Options.options.debug:
         ctx.env.prepend_value('CXXFLAGS', '-g')
+    if Options.options.mali:
+        ctx.env.append_unique('DEFINES','HAS_MALI=1')
 
     ctx.env.HAVE_EXTRAS = False
     if Options.options.extras_path is not None: