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.cc
diff --git
a/src/shader.cc
b/src/shader.cc
index
3bd46e2
..
f8f1c15
100644
(file)
--- a/
src/shader.cc
+++ b/
src/shader.cc
@@
-2,8
+2,6
@@
#include <stdio.h>
#include "shader.h"
#include <stdio.h>
#include "shader.h"
-ShaderProgram *current_program;
-
Shader::Shader() {}
Shader::~Shader()
{
Shader::Shader() {}
Shader::~Shader()
{
@@
-58,8
+56,6
@@
bool Shader::load(const char *fname, SType type)
ShaderProgram::ShaderProgram()
{
ShaderProgram::ShaderProgram()
{
- current_program = 0;
-
int len = sizeof shaders / sizeof *shaders;
for(int i=0; i<len; ++i) {
shaders[i] = 0;
int len = sizeof shaders / sizeof *shaders;
for(int i=0; i<len; ++i) {
shaders[i] = 0;
@@
-73,15
+69,4
@@
ShaderProgram::~ShaderProgram()
for(int i=0; i<len; ++i) {
delete shaders[i];
}
for(int i=0; i<len; ++i) {
delete shaders[i];
}
-}
-
-void ShaderProgram::add_shader(Shader *sdr)
-{
- assert(sdr->type < sizeof shaders / sizeof *shaders);
- shaders[sdr->type] = sdr;
-}
-
-ShaderProgram *get_current_program()
-{
- return current_program;
}
\ No newline at end of file
}
\ No newline at end of file