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

mesa: prepare create_buffers() helper for KHR_no_error support

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset
2017-06-26 12:39:42 +02:00
parent 50f9f510c9
commit 064bb7499c
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1416,25 +1416,13 @@ _mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
* driver internals.
*/
static void
create_buffers(GLsizei n, GLuint *buffers, bool dsa)
create_buffers(struct gl_context *ctx, GLsizei n, GLuint *buffers, bool dsa)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
struct gl_buffer_object *buf;
const char *func = dsa ? "glCreateBuffers" : "glGenBuffers";
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "%s(%d)\n", func, n);
if (n < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(n %d < 0)", func, n);
if (!buffers)
return;
}
if (!buffers) {
return;
}
/*
* This must be atomic (generation and allocation of buffer object IDs)
@@ -1453,7 +1441,7 @@ create_buffers(GLsizei n, GLuint *buffers, bool dsa)
assert(ctx->Driver.NewBufferObject);
buf = ctx->Driver.NewBufferObject(ctx, buffers[i]);
if (!buf) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glCreateBuffers");
_mesa_HashUnlockMutex(ctx->Shared->BufferObjects);
return;
}
@@ -1467,6 +1455,23 @@ create_buffers(GLsizei n, GLuint *buffers, bool dsa)
_mesa_HashUnlockMutex(ctx->Shared->BufferObjects);
}
static void
create_buffers_err(struct gl_context *ctx, GLsizei n, GLuint *buffers, bool dsa)
{
const char *func = dsa ? "glCreateBuffers" : "glGenBuffers";
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "%s(%d)\n", func, n);
if (n < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(n %d < 0)", func, n);
return;
}
create_buffers(ctx, n, buffers, dsa);
}
/**
* Generate a set of unique buffer object IDs and store them in \c buffers.
*
@@ -1476,7 +1481,8 @@ create_buffers(GLsizei n, GLuint *buffers, bool dsa)
void GLAPIENTRY
_mesa_GenBuffers(GLsizei n, GLuint *buffers)
{
create_buffers(n, buffers, false);
GET_CURRENT_CONTEXT(ctx);
create_buffers_err(ctx, n, buffers, false);
}
/**
@@ -1488,7 +1494,8 @@ _mesa_GenBuffers(GLsizei n, GLuint *buffers)
void GLAPIENTRY
_mesa_CreateBuffers(GLsizei n, GLuint *buffers)
{
create_buffers(n, buffers, true);
GET_CURRENT_CONTEXT(ctx);
create_buffers_err(ctx, n, buffers, true);
}