commit ee6b22d4eda7c318e88e4dc5ee011ce59b4a38c5
author Alexandros Frantzis <alexandros.frantzis@linaro.org> Fri Jun 17 16:16:16 2011 +0300
committer Alexandros Frantzis <alexandros.frantzis@linaro.org> Fri Jun 17 16:16:16 2011 +0300
tree b22c603de748998232b98601d6e7cf28b5c3f930
parent 286795329fd0ddbe94243275c149d6c2f9847655

Port all benchmarks and infrastructure to the Program object.

src/scene.h

diff --git a/src/scene.h b/src/scene.h
index 5ba06e0..fd98855 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -29,8 +29,8 @@
 #include "mesh.h"
 #include "model.h"
 #include "texture.h"
-#include "shader.h"
 #include "vec.h"
+#include "program.h"
 
 #include <math.h>
 
@@ -91,6 +91,10 @@
 
     virtual ValidationResult validate() { return ValidationUnknown; }
 
+    static bool load_shaders(Program &program,
+                             const std::string &vtx_shader_filename,
+                             const std::string &frg_shader_filename);
+
 protected:
     Scene(Screen &pScreen, const std::string &name);
     std::string construct_title(const std::string &title);
@@ -125,7 +129,10 @@
     ~SceneBuild();
 
 protected:
-    OldShader mShader;
+    Program mProgram;
+    int mVertexAttribLocation;
+    int mNormalAttribLocation;
+    int mTexcoordAttribLocation;
 
     Mesh mMesh;
     float mRotation;
@@ -148,7 +155,10 @@
     ~SceneTexture();
 
 protected:
-    OldShader mShader;
+    Program mProgram;
+    int mVertexAttribLocation;
+    int mNormalAttribLocation;
+    int mTexcoordAttribLocation;
 
     Mesh mCubeMesh;
     GLuint mTexture;
@@ -171,7 +181,10 @@
     ~SceneShading();
 
 protected:
-    OldShader mShader;
+    Program mProgram;
+    int mVertexAttribLocation;
+    int mNormalAttribLocation;
+    int mTexcoordAttribLocation;
 
     Mesh mMesh;
     float mRotation;