Merge of lp:~glmark2-dev/glmark2/canvas-drm-rebranch

Adds CanvasDRM, which uses GBM and KMS APIs to manage surfaces and modesetting,
respectively.  Allows glmark2 to run on a console and take over the framebuffer
directly (no window/display manager).

1 files changed, 43 insertions, 0 deletions

diff --git a/src/wscript_build b/src/wscript_build
index f0c233f..b742b48 100644
--- a/src/wscript_build
+++ b/src/wscript_build
@@ -4,6 +4,8 @@ common_sources = [f for f in all_sources if f.name.find('canvas-') == -1 and
                                             f.name.find('egl-') == -1]
 gl_sources = ['canvas-x11.cpp', 'canvas-x11-glx.cpp']
 glesv2_sources = ['canvas-x11.cpp', 'canvas-x11-egl.cpp', 'egl-state.cpp']
+gl_drm_sources = ['canvas-drm.cpp', 'egl-state.cpp']
+glesv2_drm_sources = ['canvas-drm.cpp', 'egl-state.cpp']
 libmatrix_sources = [f for f in bld.path.ant_glob('libmatrix/*.cc')
                      if not f.name.endswith('test.cc')]
 includes = ['.', 'scene-ideas', 'scene-terrain']
@@ -47,3 +49,44 @@ if bld.env.USE_GLESv2:
         includes     = includes,
         defines      = ['USE_GLESv2', 'USE_EXCEPTIONS']
         )
+
+if bld.env.USE_GL_DRM:
+    bld(
+        features = ['cxx', 'cxxstlib'],
+        source   = libmatrix_sources,
+        target   = 'matrix-drm',
+        lib      = ['m'],
+        includes = ['.'],
+        export_includes = 'libmatrix',
+        defines  = ['USE_DRM', '__GBM__', 'USE_GL', 'USE_EXCEPTIONS']
+        )
+    bld(
+        features     = ['cxx', 'cprogram'],
+        source       = common_sources + gl_drm_sources,
+        target       = 'glmark2-drm',
+        use          = ['egl', 'gl', 'matrix-drm', 'libpng12', 'drm', 'gbm'],
+        lib          = ['m', 'jpeg', 'dl'],
+        includes     = includes,
+        defines      = ['USE_DRM', '__GBM__', 'USE_GL']
+        )
+
+if bld.env.USE_GLESv2_DRM:
+    bld(
+        features = ['cxx', 'cxxstlib'],
+        source   = libmatrix_sources,
+        target   = 'matrix-es2-drm',
+        lib      = ['m'],
+        includes = ['.'],
+        export_includes = 'libmatrix',
+        defines  = ['USE_DRM', '__GBM__', 'USE_GLESv2', 'USE_EXCEPTIONS']
+        )
+    bld(
+        features     = ['cxx', 'cprogram'],
+        source       = common_sources + glesv2_drm_sources,
+        target       = 'glmark2-es2-drm',
+        use          = ['egl', 'glesv2', 'matrix-es2-drm', 'libpng12', 'drm',
+                        'gbm'],
+        lib          = ['m', 'jpeg', 'dl'],
+        includes     = includes,
+        defines      = ['USE_DRM', '__GBM__', 'USE_GLESv2']
+        )