projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed terrain rendering - visualized normals
[demo]
/
src
/
shader_manager.cc
diff --git
a/src/shader_manager.cc
b/src/shader_manager.cc
index
929d57a
..
7ebbce6
100644
(file)
--- a/
src/shader_manager.cc
+++ b/
src/shader_manager.cc
@@
-1,10
+1,10
@@
#include <map>
#include <map>
+#include "gfxapi.h"
+
#include "shader_manager.h"
#include "opengl/shader-gl.h"
#include "shader_manager.h"
#include "opengl/shader-gl.h"
-extern bool use_vulkan;
-
ShaderManager::ShaderManager() {}
ShaderManager::~ShaderManager() {}
ShaderManager::ShaderManager() {}
ShaderManager::~ShaderManager() {}
@@
-22,17
+22,12
@@
Shader *ShaderManager::load_shader(const char *name, SType type)
return it->second;
}
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);
if(!sdr->load(fname.c_str(), type)) {
std::string fname = path.empty() ? std::string(name) : path + "/" + std::string(name);
if(!sdr->load(fname.c_str(), type)) {
+ fprintf(stderr, "Failed to load shader: %s.\n", fname.c_str());
delete sdr;
return 0;
}
delete sdr;
return 0;
}
@@
-51,6
+46,8
@@
void ShaderManager::delete_shaders()
ShaderProgram *ShaderManager::create_shader_program(const char *vname, const char *fname)
{
ShaderProgram *ShaderManager::create_shader_program(const char *vname, const char *fname)
{
+ path = std::string(gfx_get_shader_path());
+
Shader *vsdr = load_shader(vname, SDR_VERTEX);
if(!vsdr)
return 0;
Shader *vsdr = load_shader(vname, SDR_VERTEX);
if(!vsdr)
return 0;
@@
-59,19
+56,15
@@
ShaderProgram *ShaderManager::create_shader_program(const char *vname, const cha
if(!fsdr)
return 0;
if(!fsdr)
return 0;
- ShaderProgram *sprog;
+ ShaderProgram *sprog = gfx_create_shader_program();
- if(use_vulkan) {
- // TODO
+ if(!sprog->create()) {
return 0;
}
return 0;
}
- else {
- sprog = new ShaderProgramGL;
- }
sprog->attach_shader(vsdr);
sprog->attach_shader(fsdr);
sprog->attach_shader(vsdr);
sprog->attach_shader(fsdr);
-
+
if(!sprog->link()) {
delete sprog;
return 0;
if(!sprog->link()) {
delete sprog;
return 0;