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

Thanks to the ID abstraction, we can use proper overloading now!

This commit is contained in:
Jonas Kulla 2013-09-06 12:22:55 +02:00
parent 55596e9da9
commit ba3b904f34
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gl-util.h
View File

@ -190,14 +190,14 @@ namespace FBO
bind(ID(0), mode);
}
inline void setTexTarget(Tex::ID texTarget, unsigned colorAttach = 0)
inline void setTarget(Tex::ID target, unsigned colorAttach = 0)
{
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttach, GL_TEXTURE_2D, texTarget.gl, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttach, GL_TEXTURE_2D, target.gl, 0);
}
inline void setRBOTarget(RBO::ID rbTarget, unsigned colorAttach = 0)
inline void setTarget(RBO::ID target, unsigned colorAttach = 0)
{
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttach, GL_RENDERBUFFER, rbTarget.gl);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + colorAttach, GL_RENDERBUFFER, target.gl);
}
inline void blit(int srcX, int srcY,
@ -338,7 +338,7 @@ struct TexFBO
static inline void linkFBO(TexFBO &obj)
{
FBO::bind(obj.fbo);
FBO::setTexTarget(obj.tex);
FBO::setTarget(obj.tex);
}
static inline void fini(TexFBO &obj)
@ -375,7 +375,7 @@ struct RBOFBO
static inline void linkFBO(RBOFBO &obj)
{
FBO::bind(obj.fbo);
FBO::setRBOTarget(obj.rbo);
FBO::setTarget(obj.rbo);
}
static inline void fini(RBOFBO &obj)