First attempt at a shader conditionals test scene.
diff --git a/src/main.cpp b/src/main.cpp
index d676c6a..f381df1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -206,6 +206,7 @@
Benchmark::register_scene(*new SceneBuild(canvas));
Benchmark::register_scene(*new SceneTexture(canvas));
Benchmark::register_scene(*new SceneShading(canvas));
+ Benchmark::register_scene(*new SceneConditionals(canvas));
if (Options::list_scenes) {
list_scenes();
diff --git a/src/scene-conditionals.cpp b/src/scene-conditionals.cpp
new file mode 100644
index 0000000..fa7ada8
--- /dev/null
+++ b/src/scene-conditionals.cpp
@@ -0,0 +1,192 @@
+/*
+ * Copyright © 2010-2011 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:
+ * Alexandros Frantzis (glmark2)
+ */
+#include "scene.h"
+#include "mat.h"
+#include "stack.h"
+#include "vec.h"
+#include "log.h"
+
+#include <cmath>
+#include <sstream>
+
+static const std::string shader_file_base(GLMARK_DATA_PATH"/shaders/conditionals-");
+static const std::string vtx_file(shader_file_base + "simple.vert");
+static const std::string frg_file_prologue(shader_file_base + "prologue.frag");
+static const std::string frg_file_conditional(shader_file_base + "conditional.frag");
+static const std::string frg_file_epilogue(shader_file_base + "epilogue.frag");
+
+SceneConditionals::SceneConditionals(Canvas &pCanvas) :
+ Scene(pCanvas, "conditionals")
+{
+ mOptions["fragment-conditionals"] = Scene::Option("fragment-conditionals", "1",
+ "The number of if-else conditional clauses to use");
+}
+
+SceneConditionals::~SceneConditionals()
+{
+}
+
+static void
+grid_conf(Mesh &mesh, int x, int y, int n_x, int n_y,
+ std::vector<float> &upper_left, std::vector<float> &upper_right,
+ std::vector<float> &lower_right, std::vector<float> &lower_left)
+{
+ static const double step = 0.3;
+ double x_normalized = static_cast<double>(x) / n_x;
+ double y_normalized = static_cast<double>(y) / n_y;
+
+ mesh.set_attrib(1, LibMatrix::vec4(x_normalized, y_normalized, 0.0, 1.0), &upper_left);
+ mesh.set_attrib(1, LibMatrix::vec4(x_normalized + step, y_normalized, 0.0, 1.0), &upper_right);
+ mesh.set_attrib(1, LibMatrix::vec4(x_normalized + step, y_normalized + step, 0.0, 1.0), &lower_right);
+ mesh.set_attrib(1, LibMatrix::vec4(x_normalized, y_normalized + step, 0.0, 1.0), &lower_left);
+}
+
+static std::string
+get_vertex_shader_source()
+{
+ std::string vtx_simple;
+
+ if (!gotSource(vtx_file, vtx_simple))
+ return "";
+
+ return vtx_simple;
+}
+
+static std::string
+get_fragment_shader_source(int conditionals)
+{
+ std::string frg_prologue, frg_conditional, frg_epilogue;
+
+ if (!gotSource(frg_file_prologue, frg_prologue) ||
+ !gotSource(frg_file_conditional, frg_conditional) ||
+ !gotSource(frg_file_epilogue, frg_epilogue))
+ {
+ return "";
+ }
+
+ std::stringstream ss;
+
+ ss << frg_prologue;
+ for (int i = 0; i < conditionals; i++)
+ ss << frg_conditional;
+ ss << frg_epilogue;
+
+ return ss.str();
+}
+
+int SceneConditionals::load()
+{
+ std::vector<int> vertex_format;
+ vertex_format.push_back(3);
+ vertex_format.push_back(4);
+
+ mMesh.set_vertex_format(vertex_format);
+ mMesh.make_grid(32, 32, 5.0, 5.0, 0.02, grid_conf);
+ mMesh.build_vbo();
+
+ mRotationSpeed = 36.0f;
+
+ mRunning = false;
+
+ return 1;
+}
+
+void SceneConditionals::unload()
+{
+ mMesh.reset();
+}
+
+void SceneConditionals::setup()
+{
+ Scene::setup();
+
+ int frg_conditionals;
+ std::stringstream ss(mOptions["fragment-conditionals"].value);
+
+ ss >> frg_conditionals;
+
+ std::string vtx_shader(get_vertex_shader_source());
+ std::string frg_shader(get_fragment_shader_source(frg_conditionals));
+
+ Log::debug("%s\n", frg_shader.c_str());
+ if (!Scene::load_shaders_from_strings(mProgram, vtx_shader, frg_shader))
+ return;
+
+ mProgram.start();
+
+ std::vector<GLint> attrib_locations;
+ attrib_locations.push_back(mProgram.getAttribIndex("position"));
+ mMesh.set_attrib_locations(attrib_locations);
+
+ mCurrentFrame = 0;
+ mRotation = 0.0f;
+ mRunning = true;
+ mStartTime = Scene::get_timestamp_us() / 1000000.0;
+ mLastUpdateTime = mStartTime;
+}
+
+void SceneConditionals::teardown()
+{
+ mProgram.stop();
+ mProgram.release();
+
+ Scene::teardown();
+}
+
+void SceneConditionals::update()
+{
+ double current_time = Scene::get_timestamp_us() / 1000000.0;
+ double dt = current_time - mLastUpdateTime;
+ double elapsed_time = current_time - mStartTime;
+
+ mLastUpdateTime = current_time;
+
+ if (elapsed_time >= mDuration) {
+ mAverageFPS = mCurrentFrame / elapsed_time;
+ mRunning = false;
+ }
+
+ mRotation += mRotationSpeed * dt;
+
+ mCurrentFrame++;
+}
+
+void SceneConditionals::draw()
+{
+ // Load the ModelViewProjectionMatrix uniform in the shader
+ LibMatrix::Stack4 model_view;
+ LibMatrix::mat4 model_view_proj(mCanvas.projection());
+
+ model_view.translate(0.0f, 0.0f, -5.0f);
+ model_view.rotate(mRotation, 0.0f, 0.0f, 1.0f);
+ model_view_proj *= model_view.getCurrent();
+
+ mProgram.loadUniformMatrix(model_view_proj, "ModelViewProjectionMatrix");
+
+ mMesh.render_vbo();
+}
+
+Scene::ValidationResult
+SceneConditionals::validate()
+{
+ return Scene::ValidationUnknown;
+}
diff --git a/src/scene.h b/src/scene.h
index 912cd67..7d04c67 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -205,4 +205,25 @@
float mRotationSpeed;
};
+class SceneConditionals : public Scene
+{
+public:
+ SceneConditionals(Canvas &pCanvas);
+ int load();
+ void unload();
+ void setup();
+ void teardown();
+ void update();
+ void draw();
+ ValidationResult validate();
+
+ ~SceneConditionals();
+
+protected:
+ Program mProgram;
+
+ Mesh mMesh;
+ float mRotation;
+ float mRotationSpeed;
+};
#endif
