Having a gl prefix in the commit message is inconsistent with the other
patches in this series.
Aside from that, and a comment below, this patch is:
Reviewed-by: Fredrik Höglund <fred...@kde.org>
On Thursday 12 February 2015, Laura Ekstrand wrote:
> ---
> src/mapi/glapi/gen/ARB_direct_state_access.xml | 7 +++++++
> src/mesa/main/bufferobj.c | 22 ++++++++++++++++++++++
> src/mesa/main/bufferobj.h | 4 ++++
> src/mesa/main/tests/dispatch_sanity.cpp | 1 +
> 4 files changed, 34 insertions(+)
>
> diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml
> b/src/mapi/glapi/gen/ARB_direct_state_access.xml
> index 8bcbb08..641e68f 100644
> --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
> +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
> @@ -104,6 +104,13 @@
> <param name="params" type="GLvoid **" />
> </function>
>
> + <function name="GetNamedBufferSubData" offset="assign">
> + <param name="buffer" type="GLuint" />
> + <param name="offset" type="GLintptr" />
> + <param name="size" type="GLsizeiptr" />
> + <param name="data" type="GLvoid *" />
> + </function>
> +
> <!-- Texture object functions -->
>
> <function name="CreateTextures" offset="assign">
> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
> index 015c55a..0272704 100644
> --- a/src/mesa/main/bufferobj.c
> +++ b/src/mesa/main/bufferobj.c
> @@ -1671,6 +1671,28 @@ _mesa_GetBufferSubData(GLenum target, GLintptr offset,
> ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj );
> }
>
> +void GLAPIENTRY
> +_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
> + GLsizeiptr size, GLvoid *data)
> +{
> + GET_CURRENT_CONTEXT(ctx);
> + struct gl_buffer_object *bufObj;
> +
> + bufObj = _mesa_lookup_bufferobj_err(ctx, buffer,
> + "glGetNamedBufferSubData");
> + if (!bufObj)
> + return;
> +
> + if (!buffer_object_subdata_range_good(ctx, bufObj, offset, size, false,
> + "glGetNamedBufferSubData")) {
> + return;
> + }
> +
> + ASSERT(ctx->Driver.GetBufferSubData);
This should be changed to assert() when rebasing.
> + ctx->Driver.GetBufferSubData(ctx, offset, size, data, bufObj);
> +}
> +
> +
> /**
> * \param subdata true if caller is *SubData, false if *Data
> */
> diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
> index eee04fe..feeaa8b 100644
> --- a/src/mesa/main/bufferobj.h
> +++ b/src/mesa/main/bufferobj.h
> @@ -234,6 +234,10 @@ _mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
> GLsizeiptrARB size, void * data);
>
> void GLAPIENTRY
> +_mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
> + GLsizeiptr size, GLvoid *data);
> +
> +void GLAPIENTRY
> _mesa_ClearBufferData(GLenum target, GLenum internalformat,
> GLenum format, GLenum type,
> const GLvoid *data);
> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
> b/src/mesa/main/tests/dispatch_sanity.cpp
> index ec539b4..0951e0c 100644
> --- a/src/mesa/main/tests/dispatch_sanity.cpp
> +++ b/src/mesa/main/tests/dispatch_sanity.cpp
> @@ -969,6 +969,7 @@ const struct function gl_core_functions_possible[] = {
> { "glGetNamedBufferParameteriv", 45, -1 },
> { "glGetNamedBufferParameteri64v", 45, -1 },
> { "glGetNamedBufferPointerv", 45, -1 },
> + { "glGetNamedBufferSubData", 45, -1 },
> { "glCreateTextures", 45, -1 },
> { "glTextureStorage1D", 45, -1 },
> { "glTextureStorage2D", 45, -1 },
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
