fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 02:30:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add KHR_no_error support for glNamedBufferSubData()

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri 2017-05-12 21:29:11 +10:00
parent cab148c282
commit 7ec12293be
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -68,7 +68,7 @@
<param name="usage" type="GLenum" />
</function>
<function name="NamedBufferSubData">
<function name="NamedBufferSubData" no_error="true">
<param name="buffer" type="GLuint" />
<param name="offset" type="GLintptr" />
<param name="size" type="GLsizeiptr" />

27
src/mesa/main/bufferobj.c
View file

@ -1858,22 +1858,26 @@ _mesa_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
static ALWAYS_INLINE void
buffer_sub_data(GLenum target, GLuint buffer, GLintptr offset,
GLsizeiptr size, const GLvoid *data,
bool dsa, const char *func)
bool dsa, bool no_error, const char *func)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
if (dsa) {
bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, func);
if (!bufObj)
return;
if (no_error) {
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
} else {
bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, func);
if (!bufObj)
return;
}
} else {
bufObj = get_buffer(ctx, func, target, GL_INVALID_OPERATION);
if (!bufObj)
return;
}
if (validate_buffer_sub_data(ctx, bufObj, offset, size, func))
if (no_error || validate_buffer_sub_data(ctx, bufObj, offset, size, func))
_mesa_buffer_sub_data(ctx, bufObj, offset, size, data);
}
@ -1882,14 +1886,23 @@ void GLAPIENTRY
_mesa_BufferSubData(GLenum target, GLintptr offset,
GLsizeiptr size, const GLvoid *data)
{
buffer_sub_data(target, 0, offset, size, data, false, "glBufferSubData");
buffer_sub_data(target, 0, offset, size, data, false, false,
"glBufferSubData");
}
void GLAPIENTRY
_mesa_NamedBufferSubData_no_error(GLuint buffer, GLintptr offset,
GLsizeiptr size, const GLvoid *data)
{
buffer_sub_data(0, buffer, offset, size, data, true, true,
"glNamedBufferSubData");
}
void GLAPIENTRY
_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
GLsizeiptr size, const GLvoid *data)
{
buffer_sub_data(0, buffer, offset, size, data, true,
buffer_sub_data(0, buffer, offset, size, data, true, false,
"glNamedBufferSubData");
}

3
src/mesa/main/bufferobj.h
View file

@ -197,6 +197,9 @@ _mesa_BufferSubData(GLenum target, GLintptr offset,
GLsizeiptr size, const GLvoid *data);
void GLAPIENTRY
_mesa_NamedBufferSubData_no_error(GLuint buffer, GLintptr offset,
GLsizeiptr size, const GLvoid *data);
void GLAPIENTRY
_mesa_NamedBufferSubData(GLuint buffer, GLintptr offset,
GLsizeiptr size, const GLvoid *data);