MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Shader: Throw on compile/link error, and print info logs

Browse source 
Also let go of the startup debug prints when compiling.
The engine will now tell us properly which shader fails
at which part.
This commit is contained in:
Jonas Kulla 2013-12-30 01:38:10 +01:00
parent 680e407a38
commit f2d2a1886f
2 changed files with 77 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/shader.h
View file

@ -44,8 +44,11 @@ protected:
~Shader();
void init(const unsigned char *vert, int vertSize,
const unsigned char *frag, int fragSize);
void initFromFile(const char *vertFile, const char *fragFile);
const unsigned char *frag, int fragSize,
const char *vertName, const char *fragName,
const char *programName);
void initFromFile(const char *vertFile, const char *fragFile,
const char *programName);
static void setVec4Uniform(GLint location, const Vec4 &vec);
static void setTexUniform(GLint location, unsigned unitIndex, TEX::ID texture);