git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only slightly totally broken SVG transformations
[ipdf/code.git]
/
src
/
shaderprogram.cpp
diff --git
a/src/shaderprogram.cpp
b/src/shaderprogram.cpp
index
0a5cb2e
..
45f4585
100644
(file)
--- a/
src/shaderprogram.cpp
+++ b/
src/shaderprogram.cpp
@@
-47,10
+47,10
@@
bool ShaderProgram::InitialiseShaders(const char * vertex_file, const char * fra
ShaderProgram::~ShaderProgram()
{
m_valid = false;
ShaderProgram::~ShaderProgram()
{
m_valid = false;
- for(auto shader
: m_shaders
)
+ for(auto shader
= m_shaders.begin(); shader != m_shaders.end(); ++shader
)
{
{
- glDetachShader(m_program, shader
.
obj);
- glDeleteShader(shader
.
obj);
+ glDetachShader(m_program, shader
->
obj);
+ glDeleteShader(shader
->
obj);
}
if (m_program)
}
if (m_program)
@@
-121,7
+121,7
@@
bool ShaderProgram::AttachShader(const char * src_file, GLenum type)
{
char info_log[2048];
{
char info_log[2048];
- glGetShaderInfoLog(shader_obj, 2048,
nullptr
, info_log);
+ glGetShaderInfoLog(shader_obj, 2048,
NULL
, info_log);
Error("Shader compile error (file \"%s\"): %s (type %d)", src_file, info_log, type);
return false;
}
Error("Shader compile error (file \"%s\"): %s (type %d)", src_file, info_log, type);
return false;
}
UCC
git Repository :: git.ucc.asn.au