← Back to branch summary

~mir-team/glmark2/fix-mir-include

~mir-team/glmark2/fix-mir-include

Viewing all changes in revision 261.

Committer: Alexandros Frantzis
Date: 2013-03-04 19:02:58 UTC
mfrom: (260.1.8 canvas-generic)
Revision ID: alexandros.frantzis@canonical.com-20130304190258-035q8mulveyi2ori

CanvasGeneric: Replace custom Canvases with a customizable generic Canvas

The generic Canvas is customized by initializing it with a NativeState
(X11,DRM...) and a GLState (EGL,GLX). This separation of concerns makes
it easier to support new display systems.

files added:
src/canvas-generic.cpp

src/canvas-generic.h

src/gl-state.h

src/native-state-drm.cpp

src/native-state-drm.h

src/native-state-x11.cpp

src/native-state.h

files removed:
src/canvas-drm.cpp

src/canvas-drm.h

src/canvas-x11-egl.cpp

src/canvas-x11.cpp

src/canvas-x11.h

files renamed:
src/egl-state.cpp => src/gl-state-egl.cpp

src/egl-state.h => src/gl-state-egl.h

src/canvas-x11-glx.cpp => src/gl-state-glx.cpp

src/canvas-x11-glx.h => src/gl-state-glx.h

src/canvas-x11-egl.h => src/native-state-x11.h

files modified:
android/jni/Android.mk

android/jni/Android.ndk.mk

src/main.cpp

src/wscript_build

Show diffs side-by-side

added added

removed removed

android/jni/Android.mk

android/jni/Android.ndk.mk

src/canvas-drm.cpp

src/canvas-drm.h

src/canvas-generic.cpp

src/canvas-generic.h

src/canvas-x11-egl.cpp

src/canvas-x11.cpp

src/canvas-x11.h

src/gl-state-egl.cpp

src/gl-state-egl.h

src/gl-state-glx.cpp

src/gl-state-glx.h

src/native-state-drm.cpp

src/native-state-drm.h

src/native-state-x11.cpp

src/native-state-x11.h

src/native-state.h

src/wscript_build

Older »