diff options
| -rwxr-xr-x | shared/OpenglCodecCommon/GLSharedGroup.cpp | 8 | ||||
| -rwxr-xr-x | shared/OpenglCodecCommon/GLSharedGroup.h | 8 | ||||
| -rwxr-xr-x | system/GLESv2_enc/GL2Encoder.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/shared/OpenglCodecCommon/GLSharedGroup.cpp b/shared/OpenglCodecCommon/GLSharedGroup.cpp index 19dfe0f2..e2ed6da3 100755 --- a/shared/OpenglCodecCommon/GLSharedGroup.cpp +++ b/shared/OpenglCodecCommon/GLSharedGroup.cpp @@ -28,7 +28,7 @@ static void clearObjectMap(android::DefaultKeyedVector<GLuint, T>& v) { /**** BufferData ****/ BufferData::BufferData() : m_size(0), m_usage(0), m_mapped(false) {}; -BufferData::BufferData(GLsizeiptr size, void * data) : m_size(size), m_usage(0), m_mapped(false) +BufferData::BufferData(GLsizeiptr size, const void *data) : m_size(size), m_usage(0), m_mapped(false) { void * buffer = NULL; if (size>0) buffer = m_fixedBuffer.alloc(size); @@ -260,13 +260,13 @@ SharedTextureDataMap* GLSharedGroup::getTextureData() { return &m_textureRecs; } -void GLSharedGroup::addBufferData(GLuint bufferId, GLsizeiptr size, void * data) +void GLSharedGroup::addBufferData(GLuint bufferId, GLsizeiptr size, const void* data) { android::AutoMutex _lock(m_lock); m_buffers.add(bufferId, new BufferData(size, data)); } -void GLSharedGroup::updateBufferData(GLuint bufferId, GLsizeiptr size, void * data) +void GLSharedGroup::updateBufferData(GLuint bufferId, GLsizeiptr size, const void* data) { android::AutoMutex _lock(m_lock); ssize_t idx = m_buffers.indexOfKey(bufferId); @@ -304,7 +304,7 @@ bool GLSharedGroup::isBufferMapped(GLuint bufferId) { return buf->m_mapped; } -GLenum GLSharedGroup::subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsizeiptr size, void * data) +GLenum GLSharedGroup::subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsizeiptr size, const void* data) { android::AutoMutex _lock(m_lock); BufferData * buf = m_buffers.valueFor(bufferId); diff --git a/shared/OpenglCodecCommon/GLSharedGroup.h b/shared/OpenglCodecCommon/GLSharedGroup.h index ca338362..2d680be8 100755 --- a/shared/OpenglCodecCommon/GLSharedGroup.h +++ b/shared/OpenglCodecCommon/GLSharedGroup.h @@ -46,7 +46,7 @@ struct BufferData { BufferData(); - BufferData(GLsizeiptr size, void * data); + BufferData(GLsizeiptr size, const void* data); // General buffer state GLsizeiptr m_size; @@ -153,13 +153,13 @@ public: bool isShaderOrProgramObject(GLuint obj); BufferData * getBufferData(GLuint bufferId); SharedTextureDataMap* getTextureData(); - void addBufferData(GLuint bufferId, GLsizeiptr size, void * data); - void updateBufferData(GLuint bufferId, GLsizeiptr size, void * data); + void addBufferData(GLuint bufferId, GLsizeiptr size, const void* data); + void updateBufferData(GLuint bufferId, GLsizeiptr size, const void* data); void setBufferUsage(GLuint bufferId, GLenum usage); void setBufferMapped(GLuint bufferId, bool mapped); GLenum getBufferUsage(GLuint bufferId); bool isBufferMapped(GLuint bufferId); - GLenum subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsizeiptr size, void * data); + GLenum subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsizeiptr size, const void* data); void deleteBufferData(GLuint); bool isProgram(GLuint program); diff --git a/system/GLESv2_enc/GL2Encoder.cpp b/system/GLESv2_enc/GL2Encoder.cpp index cbc0c329..b20c225e 100755 --- a/system/GLESv2_enc/GL2Encoder.cpp +++ b/system/GLESv2_enc/GL2Encoder.cpp @@ -536,7 +536,7 @@ void GL2Encoder::s_glBufferData(void * self, GLenum target, GLsizeiptr size, con SET_ERROR_IF(bufferId==0, GL_INVALID_OPERATION); SET_ERROR_IF(size<0, GL_INVALID_VALUE); - ctx->m_shared->updateBufferData(bufferId, size, (void*)data); + ctx->m_shared->updateBufferData(bufferId, size, data); ctx->m_shared->setBufferUsage(bufferId, usage); ctx->m_glBufferData_enc(self, target, size, data, usage); } @@ -549,7 +549,7 @@ void GL2Encoder::s_glBufferSubData(void * self, GLenum target, GLintptr offset, SET_ERROR_IF(bufferId==0, GL_INVALID_OPERATION); SET_ERROR_IF(ctx->isBufferTargetMapped(target), GL_INVALID_OPERATION); - GLenum res = ctx->m_shared->subUpdateBufferData(bufferId, offset, size, (void*)data); + GLenum res = ctx->m_shared->subUpdateBufferData(bufferId, offset, size, data); SET_ERROR_IF(res, res); ctx->m_glBufferSubData_enc(self, target, offset, size, data); |