Rename Framebuffer to Canvas (issue #263). Move error reporting code.

Error reporting now resides in Graphics::newCanvas() instead of the
previous location wrap_newFramebuffer(). Changed error text for
"Error in implementation" to point to a possible fix.
This commit is contained in:
vrld
2011-08-12 14:41:18 +02:00
parent 59a407bc6d
commit 28b4008797
16 changed files with 187 additions and 166 deletions
+2 -2
View File
@@ -223,7 +223,7 @@ namespace opengl
checkSetUniformError();
}
void PixelEffect::sendFramebuffer(const std::string& name, const Framebuffer& fb)
void PixelEffect::sendCanvas(const std::string& name, const Canvas& canvas)
{
GLint texture_unit = getTextureUnit(name);
@@ -231,7 +231,7 @@ namespace opengl
GLint location = getUniformLocation(name);
glActiveTexture(GL_TEXTURE0 + texture_unit);
glBindTexture(GL_TEXTURE_2D, fb.getTextureName());
glBindTexture(GL_TEXTURE_2D, canvas.getTextureName());
glUniform1i(location, texture_unit);
// reset texture unit