Merge lp:~glmark2-dev/glmark2/scene-clear into lp:glmark2/2011.11

[Jesse Barker]

SceneClear: Add new simple "null" scene. Useful as a sort of template for instantiating new scenes, as well as potentially evaluating a theoretical maximum frame rate for the framework itself (basically, it will just clear, swap buffers, and update timestamps).

[Alexandros Frantzis (afrantzis)]

8 + scenes.push_back(new SceneClear(canvas));

We should also do the same in src/android.cpp (and, yes, we have to fix this to have a single point for registering scenes).

Other than that, it looks good.

[lp:~glmark2-dev/glmark2/scene-clear]

272. By Jesse Barker on 2013-05-17

SceneClear: Need to instantiate the new scene for Android as well.

[Jesse Barker (jesse-barker)]

OK, done.

=== modified file 'src/android.cpp'
--- src/android.cpp	2012-12-07 19:57:44 +0000
+++ src/android.cpp	2013-05-17 14:56:22 +0000
@@ -277,6 +277,7 @@
     scenes.push_back(new SceneJellyfish(canvas));
     scenes.push_back(new SceneShadow(canvas));
     scenes.push_back(new SceneRefract(canvas));
+    scenes.push_back(new SceneClear(canvas));
 }
 
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-04-03 16:53:35 +0000
+++ src/main.cpp	2013-05-17 14:56:22 +0000
@@ -77,6 +77,7 @@
     scenes.push_back(new SceneJellyfish(canvas));
     scenes.push_back(new SceneShadow(canvas));
     scenes.push_back(new SceneRefract(canvas));
+    scenes.push_back(new SceneClear(canvas));
 
     for (vector<Scene*>::const_iterator iter = scenes.begin();
          iter != scenes.end();

=== added file 'src/scene-clear.cpp'
--- src/scene-clear.cpp	1970-01-01 00:00:00 +0000
+++ src/scene-clear.cpp	2013-05-17 14:56:22 +0000
@@ -0,0 +1,81 @@
+//
+// Copyright © 2013 Linaro Limited
+//
+// 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:
+//  Jesse Barker
+//
+#include "scene.h"
+#include "util.h"
+
+SceneClear::SceneClear(Canvas& canvas) :
+    Scene(canvas, "clear")
+{
+}
+
+bool
+SceneClear::load()
+{
+    running_ = false;
+    return true;
+}
+
+void
+SceneClear::unload()
+{
+}
+
+bool
+SceneClear::setup()
+{
+    if (!Scene::setup())
+        return false;
+
+    // Add scene-specific setup code here
+
+    // Set up the frame timing values and
+    // indicate that the scene is ready to run.
+    running_ = true;
+    startTime_ = Util::get_timestamp_us() / 1000000.0;
+    lastUpdateTime_ = startTime_;
+    return true;
+}
+
+void
+SceneClear::teardown()
+{
+    // Add scene-specific teardown code here
+    Scene::teardown();
+}
+
+void
+SceneClear::update()
+{
+    Scene::update();
+    // Add scene-specific update code here
+}
+
+void
+SceneClear::draw()
+{
+}
+
+Scene::ValidationResult
+SceneClear::validate()
+{
+    return Scene::ValidationUnknown;
+}

=== modified file 'src/scene.h'
--- src/scene.h	2012-12-17 16:08:05 +0000
+++ src/scene.h	2013-05-17 14:56:22 +0000
@@ -589,4 +589,17 @@
     ValidationResult validate();
 };
 
+class SceneClear : public Scene
+{
+public:
+    SceneClear(Canvas &pCanvas);
+    bool load();
+    void unload();
+    bool setup();
+    void teardown();
+    void update();
+    void draw();
+    ValidationResult validate();
+};
+
 #endif