X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fshader_manager.cc;h=7ebbce62dcb919c0d371172a7be9d7ce3fd99d14;hp=87c0451f0c989f36c2dbb8a115da3fdb2c8b2d40;hb=3bf3536271e4afa8a8a93c75e2ab1256c0bf718a;hpb=df336012c33f2993bdb80177a1f874ef81e7505f

diff --git a/src/shader_manager.cc b/src/shader_manager.cc
index 87c0451..7ebbce6 100644
--- a/src/shader_manager.cc
+++ b/src/shader_manager.cc
@@ -1,10 +1,10 @@
 #include <map>
 
+#include "gfxapi.h"
+
 #include "shader_manager.h"
 #include "opengl/shader-gl.h"
 
-extern bool use_vulkan;
-
 ShaderManager::ShaderManager() {}
 ShaderManager::~ShaderManager() {}
 
@@ -22,13 +22,7 @@ Shader *ShaderManager::load_shader(const char *name, SType type)
 		return it->second;
 	}
 
-	Shader *sdr;
-	if(use_vulkan) {
-		// 	sdr = new ShaderVK;
-	}
-	else {
-		sdr = new ShaderGL;
-	}
+	Shader *sdr = gfx_create_shader();
 
 	std::string fname = path.empty() ? std::string(name) : path + "/" + std::string(name);
 
@@ -52,7 +46,7 @@ void ShaderManager::delete_shaders()
 
 ShaderProgram *ShaderManager::create_shader_program(const char *vname, const char *fname)
 {
-	path = use_vulkan ? "vk_shaders" : "gl_shaders";
+	path = std::string(gfx_get_shader_path());
 
 	Shader *vsdr = load_shader(vname, SDR_VERTEX);
 	if(!vsdr)
@@ -62,15 +56,7 @@ ShaderProgram *ShaderManager::create_shader_program(const char *vname, const cha
 	if(!fsdr)
 		return 0;
 
-	ShaderProgram *sprog;
-
-	if(use_vulkan) {
-		// TODO
-		return 0;
-	}
-	else {
-		sprog = new ShaderProgramGL;
-	}
+	ShaderProgram *sprog = gfx_create_shader_program();
 
 	if(!sprog->create()) {
 		return 0;