Changeset 9942 in orxonox.OLD

Timestamp:

Nov 22, 2006, 2:58:51 PM (17 years ago)

Author:

bensch

Message:

HACK: Checking shader ability
@orxonoxers: make this faster

Location:

trunk/src/lib/graphics

Files:

• shader.cc (modified) (2 diffs)
• shader.h (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -35 +35 @@
 void Shader::Uniform::setV(unsigned int count, float* vv) const
 {
+        if (Shader::isSupported()) 
   switch (count)
   {
@@ -53 +54 @@
 void Shader::Uniform::setV(unsigned int count, int* vv) const
 {
+        if (Shader::isSupported()) 
   switch (count)
   {

trunk/src/lib/graphics/shader.h

@@ -22 +22 @@
   {
   public:
-    Uniform(const Shader& shader, const std::string& location) { this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
-    Uniform(GLhandleARB shaderProgram, const std::string& location) { this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
+          Uniform(const Shader& shader, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
+          Uniform(GLhandleARB shaderProgram, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
 
-    void set(float v0) const { glUniform1f(this->uniform, v0); }
-    void set(float v0, float v1) const { glUniform2f(this->uniform, v0, v1); }
-    void set(float v0, float v1, float v2) const { glUniform3f(this->uniform, v0, v1, v2); }
-    void set(float v0, float v1, float v2, float v3) const { glUniform4f(this->uniform, v0, v1, v2, v3); }
+    void set(float v0) const { if (Shader::isSupported()) glUniform1f(this->uniform, v0); }
+    void set(float v0, float v1) const { if (Shader::isSupported()) glUniform2f(this->uniform, v0, v1); }
+    void set(float v0, float v1, float v2) const { if (Shader::isSupported()) glUniform3f(this->uniform, v0, v1, v2); }
+    void set(float v0, float v1, float v2, float v3) const { if (Shader::isSupported()) glUniform4f(this->uniform, v0, v1, v2, v3); }
 
-    void set(int v0) const { glUniform1i(this->uniform, v0); }
-    void set(int v0, int v1) const { glUniform2i(this->uniform, v0, v1); }
-    void set(int v0, int v1, int v2) const { glUniform3i(this->uniform, v0, v1, v2); }
-    void set(int v0, int v1, int v2, int v3) const { glUniform4i(this->uniform, v0, v1, v2, v3); }
+    void set(int v0) const { if (Shader::isSupported()) glUniform1i(this->uniform, v0); }
+    void set(int v0, int v1) const { if (Shader::isSupported()) glUniform2i(this->uniform, v0, v1); }
+    void set(int v0, int v1, int v2) const { if (Shader::isSupported()) glUniform3i(this->uniform, v0, v1, v2); }
+    void set(int v0, int v1, int v2, int v3) const {if (Shader::isSupported())  glUniform4i(this->uniform, v0, v1, v2, v3); }
 
     void setV(unsigned int count, float* vv) const;
@@ -68 +68 @@
 
   static bool checkShaderAbility();
+  static bool isSupported() { return checkShaderAbility(); };
 
   inline static bool isShaderActive() { return (Shader::storedShader != NULL) ? true : false; };