Minor cleanup

This commit is contained in:
Alexander Szpakowski
2013-01-04 05:05:25 -04:00
parent dcf9825226
commit 37191a5953
5 changed files with 36 additions and 30 deletions
+27 -26
View File
@@ -21,32 +21,6 @@
#include "ShaderEffect.h"
#include "Graphics.h"
namespace
{
// temporarily attaches a shader program (for setting uniforms, etc)
// reattaches the originally active program when destroyed
struct TemporaryAttacher
{
TemporaryAttacher(love::graphics::opengl::ShaderEffect *sp)
: cureffect(sp)
, preveffect(love::graphics::opengl::ShaderEffect::current)
{
cureffect->attach(true);
}
~TemporaryAttacher()
{
if (preveffect != NULL)
preveffect->attach();
else
love::graphics::opengl::ShaderEffect::detach();
}
love::graphics::opengl::ShaderEffect *cureffect;
love::graphics::opengl::ShaderEffect *preveffect;
};
} // anonymous namespace
namespace love
{
namespace graphics
@@ -54,6 +28,33 @@ namespace graphics
namespace opengl
{
namespace
{
// temporarily attaches a shader program (for setting uniforms, etc)
// reattaches the originally active program when destroyed
struct TemporaryAttacher
{
TemporaryAttacher(ShaderEffect *sp)
: cureffect(sp)
, preveffect(ShaderEffect::current)
{
cureffect->attach(true);
}
~TemporaryAttacher()
{
if (preveffect != NULL)
preveffect->attach();
else
ShaderEffect::detach();
}
ShaderEffect *cureffect;
ShaderEffect *preveffect;
};
} // anonymous namespace
ShaderEffect *ShaderEffect::current = NULL;
GLint ShaderEffect::_max_texture_units = 0;