{
(void) ctx; (void) target;
- if (bufObj->Data && ((GLuint) (size + offset) <= bufObj->Size)) {
+ if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
_mesa_memcpy( data, (GLubyte *) bufObj->Data + offset, size );
}
}
GLenum format, GLenum type, const GLvoid *ptr)
{
GLvoid *start, *end;
+ const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
ASSERT(pack->BufferObj->Name != 0);
format, type, depth-1, height-1, width);
- if ((const GLubyte *) start > (const GLubyte *) pack->BufferObj->Size) {
+ sizeAddr = ((const GLubyte *) 0) + pack->BufferObj->Size;
+
+ if ((const GLubyte *) start > sizeAddr) {
/* This will catch negative values / wrap-around */
return GL_FALSE;
}
- if ((const GLubyte *) end > (const GLubyte *) pack->BufferObj->Size) {
+ if ((const GLubyte *) end > sizeAddr) {
/* Image read goes beyond end of buffer */
return GL_FALSE;
}
GLenum target = 0;
bufObj = (*ctx->Driver.NewBufferObject)( ctx, name, target );
if (!bufObj) {
+ _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenBuffersARB");
return;
}
switch (pname) {
case GL_BUFFER_SIZE_ARB:
- *params = bufObj->Size;
+ *params = (GLint) bufObj->Size;
break;
case GL_BUFFER_USAGE_ARB:
*params = bufObj->Usage;