wip

allen-cell-animated · Dec 30, 2024 · 2b43edd · 2b43edd
1 parent 3f1bb76
commit 2b43edd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/renderlib/graphics/glsl/shaders.cpp b/renderlib/graphics/glsl/shaders.cpp
@@ -2,18 +2,26 @@
 
 #include "shaders/basicVolume_frag_gen.hpp"
 
-static std::unordered_map<std::string, std::string> shader_src = { { "shader", basicVolume_frag_shader } };
+struct ShaderEntry
+{
+  std::string src;
+  GLenum type;
+};
+
+static std::unordered_map<std::string, ShaderEntry> shader_src = {
+  { "basicVolume", { basicVolume_frag_shader, GL_FRAGMENT_SHADER } }
+};
 static std::unordered_map<std::string, GLShader*> shaders;
 
 bool
 ShaderArray::BuildShaders()
 {
-  for (auto& shader : shader_src) {
-    GLShader* s = new GLShader(GL_FRAGMENT_SHADER);
-    if (s->compileSourceCode(shader.second.c_str())) {
-      shaders[shader.first] = s;
+  for (auto& shaderEntry : shader_src) {
+    GLShader* s = new GLShader(shaderEntry.second.type);
+    if (s->compileSourceCode(shaderEntry.second.src.c_str())) {
+      shaders[shaderEntry.first] = s;
     } else {
-      LOG_ERROR << "Failed to compile shader " << shader.first;
+      LOG_ERROR << "Failed to compile shader " << shaderEntry.first;
       return false;
     }
   }

diff --git a/renderlib/renderlib.cpp b/renderlib/renderlib.cpp
@@ -297,6 +297,8 @@ renderlib::initialize(std::string assetPath, bool headless, bool listDevices, in
   LOG_INFO << "Compiling all shaders...";
   if (!ShaderArray::BuildShaders()) {
     status = 0;
+  } else {
+    LOG_INFO << "Shaders compiled successfully";
   }
 
   delete dummyHeadlessContext;