OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: added new GL3 buffer object queries

Browse Source 
And clean up the error checking code.
This commit is contained in:
Brian Paul
2010-03-20 11:52:12 -06:00
parent 8829e063aa
commit d6a9f5b3da
1 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/mesa/main/bufferobj.c
View File

@@ -32,6 +32,7 @@
#include "glheader.h" #include "glheader.h"
#include "enums.h"
#include "hash.h" #include "hash.h"
#include "imports.h" #include "imports.h"
#include "image.h" #include "image.h"
@@ -1376,31 +1377,49 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
bufObj = get_buffer(ctx, target); bufObj = get_buffer(ctx, target);
if (!bufObj) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameterivARB(target)" ); _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );
return; return;
} }
if (!_mesa_is_bufferobj(bufObj)) { if (!_mesa_is_bufferobj(bufObj)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );
return; return;
} }
switch (pname) { switch (pname) {
case GL_BUFFER_SIZE_ARB: case GL_BUFFER_SIZE_ARB:
*params = (GLint) bufObj->Size; *params = (GLint) bufObj->Size;
break; return;
case GL_BUFFER_USAGE_ARB: case GL_BUFFER_USAGE_ARB:
*params = bufObj->Usage; *params = bufObj->Usage;
break; return;
case GL_BUFFER_ACCESS_ARB: case GL_BUFFER_ACCESS_ARB:
*params = simplified_access_mode(bufObj->AccessFlags); *params = simplified_access_mode(bufObj->AccessFlags);
break; return;
case GL_BUFFER_MAPPED_ARB: case GL_BUFFER_MAPPED_ARB:
*params = _mesa_bufferobj_mapped(bufObj); *params = _mesa_bufferobj_mapped(bufObj);
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
return; return;
case GL_BUFFER_ACCESS_FLAGS:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = bufObj->AccessFlags;
return;
case GL_BUFFER_MAP_OFFSET:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = (GLint) bufObj->Offset;
return;
case GL_BUFFER_MAP_LENGTH:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = (GLint) bufObj->Length;
return;
default:
; /* fall-through */
} }
invalid_pname:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",
_mesa_lookup_enum_by_nr(pname));
} }
@@ -1418,31 +1437,50 @@ _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
bufObj = get_buffer(ctx, target); bufObj = get_buffer(ctx, target);
if (!bufObj) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameteri64v(target)" ); _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );
return; return;
} }
if (!_mesa_is_bufferobj(bufObj)) { if (!_mesa_is_bufferobj(bufObj)) {
_mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameteri64v" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );
return; return;
} }
switch (pname) { switch (pname) {
case GL_BUFFER_SIZE_ARB: case GL_BUFFER_SIZE_ARB:
*params = bufObj->Size; *params = bufObj->Size;
break; return;
case GL_BUFFER_USAGE_ARB: case GL_BUFFER_USAGE_ARB:
*params = bufObj->Usage; *params = bufObj->Usage;
break; return;
case GL_BUFFER_ACCESS_ARB: case GL_BUFFER_ACCESS_ARB:
*params = simplified_access_mode(bufObj->AccessFlags); *params = simplified_access_mode(bufObj->AccessFlags);
break; return;
case GL_BUFFER_ACCESS_FLAGS:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = bufObj->AccessFlags;
return;
case GL_BUFFER_MAPPED_ARB: case GL_BUFFER_MAPPED_ARB:
*params = _mesa_bufferobj_mapped(bufObj); *params = _mesa_bufferobj_mapped(bufObj);
break; return;
case GL_BUFFER_MAP_OFFSET:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = bufObj->Offset;
return;
case GL_BUFFER_MAP_LENGTH:
if (ctx->VersionMajor < 3)
goto invalid_pname;
*params = bufObj->Length;
return;
default: default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname)"); ; /* fall-through */
return; return;
} }
invalid_pname:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",
_mesa_lookup_enum_by_nr(pname));
} }