LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 03:34:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved the Texture and Quad Lua wrapper files out of the opengl graphics implementation folder.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-03-01 03:51:44 -04:00
parent c572b1af19
commit 3830a0969c
28 changed files with 79 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+6 -12
View File
@@ -301,7 +301,7 @@ void Canvas::drawv(const Matrix &t, const Vertex *v)
OpenGL::TempTransform transform(gl);
transform.get() *= t;
predraw();
gl.bindTexture(texture);
glEnableVertexAttribArray(ATTRIB_POS);
glEnableVertexAttribArray(ATTRIB_TEXCOORD);
@@ -314,8 +314,6 @@ void Canvas::drawv(const Matrix &t, const Vertex *v)
glDisableVertexAttribArray(ATTRIB_TEXCOORD);
glDisableVertexAttribArray(ATTRIB_POS);
postdraw();
}
void Canvas::draw(float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
@@ -350,7 +348,8 @@ bool Canvas::setWrap(const Texture::Wrap &w)
bool success = true;
wrap = w;
if (hasLimitedNpot() && (width != next_p2(width) || height != next_p2(height)))
if ((GLAD_ES_VERSION_2_0 && !(GLAD_ES_VERSION_3_0 || GLAD_OES_texture_npot))
&& (width != next_p2(width) || height != next_p2(height)))
{
if (wrap.s != WRAP_CLAMP || wrap.t != WRAP_CLAMP)
success = false;
@@ -365,14 +364,9 @@ bool Canvas::setWrap(const Texture::Wrap &w)
return success;
}
GLuint Canvas::getGLTexture() const
const void *Canvas::getHandle() const
{
return texture;
}
void Canvas::predraw()
{
gl.bindTexture(texture);
return &texture;
}
void Canvas::setupGrab()
@@ -459,7 +453,7 @@ void Canvas::startGrab(const std::vector<Canvas *> &canvases)
for (int i = 0; i < (int) canvases.size(); i++)
{
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1 + i,
GL_TEXTURE_2D, canvases[i]->getGLTexture(), 0);
GL_TEXTURE_2D, *(GLuint *) canvases[i]->getHandle(), 0);
drawbuffers.push_back(GL_COLOR_ATTACHMENT1 + i);
}