mirror of
https://github.com/love2d/love.git
synced 2026-08-17 19:23:38 +02:00
Revise spritebatch locking (binding now) (issue #231)
This commit is contained in:
@@ -161,11 +161,13 @@ namespace opengl
|
|||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
|
glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
|
||||||
lockp = (vertex *)glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
|
lockp = (vertex *)glMapBuffer(GL_ARRAY_BUFFER, GL_READ_WRITE);
|
||||||
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
return lockp;
|
return lockp;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpriteBatch::unlock()
|
void SpriteBatch::unlock()
|
||||||
{
|
{
|
||||||
|
glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
|
||||||
glUnmapBuffer(GL_ARRAY_BUFFER);
|
glUnmapBuffer(GL_ARRAY_BUFFER);
|
||||||
lockp = 0;
|
lockp = 0;
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
|
|||||||
@@ -67,14 +67,14 @@ namespace opengl
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int w_SpriteBatch_lock(lua_State * L)
|
int w_SpriteBatch_bind(lua_State * L)
|
||||||
{
|
{
|
||||||
SpriteBatch * t = luax_checkspritebatch(L, 1);
|
SpriteBatch * t = luax_checkspritebatch(L, 1);
|
||||||
lua_pushlightuserdata(L, t->lock());
|
t->lock();
|
||||||
return 1;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int w_SpriteBatch_unlock(lua_State * L)
|
int w_SpriteBatch_unbind(lua_State * L)
|
||||||
{
|
{
|
||||||
SpriteBatch * t = luax_checkspritebatch(L, 1);
|
SpriteBatch * t = luax_checkspritebatch(L, 1);
|
||||||
t->unlock();
|
t->unlock();
|
||||||
@@ -93,8 +93,8 @@ namespace opengl
|
|||||||
{ "add", w_SpriteBatch_add },
|
{ "add", w_SpriteBatch_add },
|
||||||
{ "addq", w_SpriteBatch_addq },
|
{ "addq", w_SpriteBatch_addq },
|
||||||
{ "clear", w_SpriteBatch_clear },
|
{ "clear", w_SpriteBatch_clear },
|
||||||
{ "lock", w_SpriteBatch_lock },
|
{ "bind", w_SpriteBatch_bind },
|
||||||
{ "unlock", w_SpriteBatch_unlock },
|
{ "unbind", w_SpriteBatch_unbind },
|
||||||
{ "setImage", w_SpriteBatch_setImage },
|
{ "setImage", w_SpriteBatch_setImage },
|
||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user