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

mesa/marshal: fix glNamedBufferData with NULL data

Browse Source 
The semantics are similar to glBufferData.

Tested-by: Marc Dietrich <marvin24@gmx.de>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Grigori Goronzy
2017-07-10 01:55:52 +02:00
parent 1ad24faa11
commit cfbf60b0c2
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/main/marshal.c
View File

@@ -415,6 +415,7 @@ struct marshal_cmd_NamedBufferData
GLuint name; GLuint name;
GLsizei size; GLsizei size;
GLenum usage; GLenum usage;
bool data_null; /* If set, no data follows for "data" */
/* Next size bytes are GLubyte data[size] */ /* Next size bytes are GLubyte data[size] */
}; };
@@ -425,7 +426,12 @@ _mesa_unmarshal_NamedBufferData(struct gl_context *ctx,
const GLuint name = cmd->name; const GLuint name = cmd->name;
const GLsizei size = cmd->size; const GLsizei size = cmd->size;
const GLenum usage = cmd->usage; const GLenum usage = cmd->usage;
const void *data = (const void *) (cmd + 1); const void *data;
if (cmd->data_null)
data = NULL;
else
data = (const void *) (cmd + 1);
CALL_NamedBufferData(ctx->CurrentServerDispatch, CALL_NamedBufferData(ctx->CurrentServerDispatch,
(name, size, data, usage)); (name, size, data, usage));
@@ -436,7 +442,7 @@ _mesa_marshal_NamedBufferData(GLuint buffer, GLsizeiptr size,
const GLvoid * data, GLenum usage) const GLvoid * data, GLenum usage)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
size_t cmd_size = sizeof(struct marshal_cmd_NamedBufferData) + size; size_t cmd_size = sizeof(struct marshal_cmd_NamedBufferData) + (data ? size : 0);
debug_print_marshal("NamedBufferData"); debug_print_marshal("NamedBufferData");
if (unlikely(size < 0)) { if (unlikely(size < 0)) {
@@ -452,8 +458,11 @@ _mesa_marshal_NamedBufferData(GLuint buffer, GLsizeiptr size,
cmd->name = buffer; cmd->name = buffer;
cmd->size = size; cmd->size = size;
cmd->usage = usage; cmd->usage = usage;
char *variable_data = (char *) (cmd + 1); cmd->data_null = !data;
memcpy(variable_data, data, size); if (data) {
char *variable_data = (char *) (cmd + 1);
memcpy(variable_data, data, size);
}
_mesa_post_marshal_hook(ctx); _mesa_post_marshal_hook(ctx);
} else { } else {
_mesa_glthread_finish(ctx); _mesa_glthread_finish(ctx);