Add support for glUniformXfv and glUniformXiv

mc-imperial · May 3, 2017 · 96a0072 · 96a0072
1 parent 8856bec
commit 96a0072
Showing 1 changed file with 46 additions and 0 deletions.
diff --git a/get_image.cpp b/get_image.cpp
@@ -127,6 +127,20 @@ int render(
   return EXIT_SUCCESS;
 }
 
+template<typename T>
+T *getArray(const json& j) {
+  T *a = new T[j.size()];
+  for (int i = 0; i < j.size(); i++) {
+    a[i] = j[i];
+  }
+  return a;
+}
+
+#define GLUNIFORM_ARRAYINIT(funcname, uniformloc, gltype, jsonarray)     \
+  gltype *a = getArray<gltype>(jsonarray.size()); \
+  funcname(uniformloc, jsonarray.size(), a); \
+  delete [] a
+
 int setUniformsFromJSON(const std::string& jsonFilename, const GLuint& program) {
   std::string jsonContent;
   if (!readFile(jsonFilename, jsonContent)) {
@@ -182,6 +196,38 @@ int setUniformsFromJSON(const std::string& jsonFilename, const GLuint& program)
       glUniform4i(uniformLocation, args[0], args[1], args[2], args[3]);
     }
 
+    // Note: no "glUniformXui" variant in OpenGL ES
+
+    // else if (uniformFunc == "glUniform1ui") {
+    //   glUniform1ui(uniformLocation, args[0]);
+    // } else if (uniformFunc == "glUniform2ui") {
+    //   glUniform2ui(uniformLocation, args[0], args[1]);
+    // } else if (uniformFunc == "glUniform3ui") {
+    //   glUniform3ui(uniformLocation, args[0], args[1], args[2]);
+    // } else if (uniformFunc == "glUniform4ui") {
+    //   glUniform4ui(uniformLocation, args[0], args[1], args[2], args[3]);
+    // }
+
+    else if (uniformFunc == "glUniform1fv") {
+      GLUNIFORM_ARRAYINIT(glUniform1fv, uniformLocation, GLfloat, args);
+    } else if (uniformFunc == "glUniform2fv") {
+      GLUNIFORM_ARRAYINIT(glUniform2fv, uniformLocation, GLfloat, args);
+    } else if (uniformFunc == "glUniform3fv") {
+      GLUNIFORM_ARRAYINIT(glUniform3fv, uniformLocation, GLfloat, args);
+    } else if (uniformFunc == "glUniform4fv") {
+      GLUNIFORM_ARRAYINIT(glUniform4fv, uniformLocation, GLfloat, args);
+    }
+
+    else if (uniformFunc == "glUniform1iv") {
+      GLUNIFORM_ARRAYINIT(glUniform1iv, uniformLocation, GLint, args);
+    } else if (uniformFunc == "glUniform2iv") {
+      GLUNIFORM_ARRAYINIT(glUniform2iv, uniformLocation, GLint, args);
+    } else if (uniformFunc == "glUniform3iv") {
+      GLUNIFORM_ARRAYINIT(glUniform3iv, uniformLocation, GLint, args);
+    } else if (uniformFunc == "glUniform4iv") {
+      GLUNIFORM_ARRAYINIT(glUniform4iv, uniformLocation, GLint, args);
+    }
+
     else {
       std::cerr << "Error: unknown uniform init func: " << uniformFunc << std::endl;
       return EXIT_FAILURE;