LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-19 04:05:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated to love-android changeset 3b5e5e182a00

Browse Source
This commit is contained in:
Martin Felis
2014-01-12 21:21:46 +01:00
parent 0ff0941068
commit 69b200b144
396 changed files with 52558 additions and 2317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/modules/graphics/opengl/VertexBuffer.cpp
+7 -7
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2013 LOVE Development Team
* Copyright (c) 2006-2014 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -165,7 +165,7 @@ void *VBO::map()
if (is_dirty)
{
glGetBufferSubData(getTarget(), 0, getSize(), memory_map);
glGetBufferSubData(getTarget(), 0, (GLsizeiptr) getSize(), memory_map);
is_dirty = false;
}
@@ -189,8 +189,8 @@ void VBO::unmap()
// "orphan" current buffer to avoid implicit synchronisation on the GPU:
// http://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-AsynchronousBufferTransfers.pdf
glBufferData(getTarget(), getSize(), NULL, getUsage());
glBufferData(getTarget(), getSize(), memory_map, getUsage());
glBufferData(getTarget(), (GLsizeiptr) getSize(), NULL, getUsage());
glBufferData(getTarget(), (GLsizeiptr) getSize(), memory_map, getUsage());
is_mapped = false;
}
@@ -230,7 +230,7 @@ void VBO::fill(size_t offset, size_t size, const void *data)
// Now we tell the driver it only needs to deal with the data
// we changed.
memcpy(static_cast<char *>(mapdata) + offset, data, size);
glFlushMappedBufferRangeAPPLE(getTarget(), offset, size);
glFlushMappedBufferRangeAPPLE(getTarget(), (GLintptr) offset, (GLsizei) size);
}
glUnmapBuffer(getTarget());
@@ -238,7 +238,7 @@ void VBO::fill(size_t offset, size_t size, const void *data)
else
{
// Fall back to a possibly slower SubData (more chance of syncing.)
glBufferSubData(getTarget(), offset, size, data);
glBufferSubData(getTarget(), (GLintptr) offset, (GLsizeiptr) size, data);
}
if (getMemoryBacking() != BACKING_FULL)
@@ -280,7 +280,7 @@ bool VBO::load(bool restore)
glBufferParameteriAPPLE(getTarget(), GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE);
// Note that if 'src' is '0', no data will be copied.
glBufferData(getTarget(), getSize(), src, getUsage());
glBufferData(getTarget(), (GLsizeiptr) getSize(), src, getUsage());
GLenum err = glGetError();
return (GL_NO_ERROR == err);