[Mesa-dev] [PATCH 13/24] mesa: hook up (Named)BufferStorageMem api
Timothy Arceri
tarceri at itsqueeze.com
Thu Jul 27 00:30:30 UTC 2017
On 27/07/17 01:22, Samuel Pitoiset wrote
> On 07/26/2017 01:46 PM, Timothy Arceri wrote:
>> Include no_error variants as well.
>>
>> v2 (Timothy Arceri):
>> - reduced code churn by squashing some changes into
>> previous commits
>>
>> Signed-off-by: Andres Rodriguez <andresx7 at gmail.com>
>> Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
>> ---
>> src/mesa/main/bufferobj.c | 62
>> ++++++++++++++++++++++++++++++++---------------
>> src/mesa/main/bufferobj.h | 3 +++
>> 2 files changed, 45 insertions(+), 20 deletions(-)
>>
>> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
>> index 720569d..65c999a 100644
>> --- a/src/mesa/main/bufferobj.c
>> +++ b/src/mesa/main/bufferobj.c
>> @@ -39,6 +39,7 @@
>> #include "imports.h"
>> #include "context.h"
>> #include "bufferobj.h"
>> +#include "externalobjects.h"
>> #include "mtypes.h"
>> #include "teximage.h"
>> #include "glformats.h"
>> @@ -1806,9 +1807,12 @@ validate_buffer_storage(struct gl_context *ctx,
>> static void
>> buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
>> - GLenum target, GLsizeiptr size, const GLvoid *data,
>> - GLbitfield flags, const char *func)
>> + struct gl_memory_object *memObj, GLenum target,
>> + GLsizeiptr size, const GLvoid *data, GLbitfield flags,
>> + GLuint64 offset, const char *func)
>> {
>> + GLboolean err;
>> +
>> /* Unmap the existing buffer. We'll replace it now. Not an
>> error. */
>> _mesa_buffer_unmap_all_mappings(ctx, bufObj);
>> @@ -1818,9 +1822,18 @@ buffer_storage(struct gl_context *ctx, struct
>> gl_buffer_object *bufObj,
>> bufObj->Immutable = GL_TRUE;
>> bufObj->MinMaxCacheDirty = true;
>> - assert(ctx->Driver.BufferData);
>> - if (!ctx->Driver.BufferData(ctx, target, size, data, GL_DYNAMIC_DRAW,
>> - flags, bufObj)) {
>> + if (memObj) {
>> + assert(ctx->Driver.BufferData);
>
> Copy paste error?
>
>> + err = ctx->Driver.BufferDataMem(ctx, target, size, memObj, offset,
>> + GL_DYNAMIC_DRAW, bufObj);
>> + }
>> + else {
>> + assert(ctx->Driver.BufferData);
>> + err = ctx->Driver.BufferData(ctx, target, size, data,
>> GL_DYNAMIC_DRAW,
>> + flags, bufObj);
>> + }
>> +
>> + if (err) {
>> if (target == GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD) {
>> /* Even though the interaction between AMD_pinned_memory and
>> * glBufferStorage is not described in the spec, Graham
>> Sellers
>> @@ -1837,11 +1850,16 @@ buffer_storage(struct gl_context *ctx, struct
>> gl_buffer_object *bufObj,
>> static ALWAYS_INLINE void
>> inlined_buffer_storage(GLenum target, GLuint buffer, GLsizeiptr size,
>> - const GLvoid *data, GLbitfield flags, bool dsa,
>> - bool no_error, const char *func)
>> + const GLvoid *data, GLbitfield flags,
>> + GLuint memory, GLuint64 offset,
>> + bool dsa, bool mem, bool no_error, const char
>> *func)
>> {
>> GET_CURRENT_CONTEXT(ctx);
>> struct gl_buffer_object *bufObj;
>> + struct gl_memory_object *memObj = NULL;
>> +
>> + if (mem)
>> + memObj = _mesa_lookup_memory_object(ctx, memory);
>> if (dsa) {
>> if (no_error) {
>> @@ -1863,7 +1881,7 @@ inlined_buffer_storage(GLenum target, GLuint
>> buffer, GLsizeiptr size,
>> }
>> if (no_error || validate_buffer_storage(ctx, bufObj, size, flags,
>> func))
>> - buffer_storage(ctx, bufObj, target, size, data, flags, func);
>> + buffer_storage(ctx, bufObj, memObj, target, size, data, flags,
>> offset, func);
>> }
>> @@ -1871,8 +1889,8 @@ void GLAPIENTRY
>> _mesa_BufferStorage_no_error(GLenum target, GLsizeiptr size,
>> const GLvoid *data, GLbitfield flags)
>> {
>> - inlined_buffer_storage(target, 0, size, data, flags, false, true,
>> - "glBufferStorage");
>> + inlined_buffer_storage(target, 0, size, data, flags, GL_NONE, 0,
>> + false, false, true, "glBufferStorage");
>> }
>> @@ -1880,8 +1898,8 @@ void GLAPIENTRY
>> _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
>> GLbitfield flags)
>> {
>> - inlined_buffer_storage(target, 0, size, data, flags, false, false,
>> - "glBufferStorage");
>> + inlined_buffer_storage(target, 0, size, data, flags, GL_NONE, 0,
>> + false, false, false, "glBufferStorage");
>> }
>> @@ -1889,7 +1907,8 @@ void GLAPIENTRY
>> _mesa_BufferStorageMemEXT(GLenum target, GLsizeiptr size,
>> GLuint memory, GLuint64 offset)
>> {
>> -
>> + inlined_buffer_storage(target, 0, size, NULL, 0, memory, offset,
>> + false, true, false, "glBufferStorageMemEXT");
>> }
>> @@ -1897,7 +1916,8 @@ void GLAPIENTRY
>> _mesa_BufferStorageMemEXT_no_error(GLenum target, GLsizeiptr size,
>> GLuint memory, GLuint64 offset)
>> {
>> -
>> + inlined_buffer_storage(target, 0, size, NULL, 0, memory, offset,
>> + false, true, true, "glBufferStorageMemEXT");
>> }
>> @@ -1908,8 +1928,8 @@ _mesa_NamedBufferStorage_no_error(GLuint buffer,
>> GLsizeiptr size,
>> /* In direct state access, buffer objects have an unspecified target
>> * since they are not required to be bound.
>> */
>> - inlined_buffer_storage(GL_NONE, buffer, size, data, flags, true,
>> true,
>> - "glNamedBufferStorage");
>> + inlined_buffer_storage(GL_NONE, buffer, size, data, flags,
>> GL_NONE, 0,
>> + true, false, true, "glNamedBufferStorage");
>> }
>> @@ -1920,8 +1940,8 @@ _mesa_NamedBufferStorage(GLuint buffer,
>> GLsizeiptr size, const GLvoid *data,
>> /* In direct state access, buffer objects have an unspecified target
>> * since they are not required to be bound.
>> */
>> - inlined_buffer_storage(GL_NONE, buffer, size, data, flags, true,
>> false,
>> - "glNamedBufferStorage");
>> + inlined_buffer_storage(GL_NONE, buffer, size, data, flags,
>> GL_NONE, 0,
>> + true, false, false, "glNamedBufferStorage");
>> }
>> @@ -1929,7 +1949,8 @@ void GLAPIENTRY
>> _mesa_NamedBufferStorageMemEXT(GLuint buffer, GLsizeiptr size,
>> GLuint memory, GLuint64 offset)
>> {
>> -
>> + inlined_buffer_storage(GL_NONE, buffer, size, GL_NONE, 0, memory,
>> offset,
>> + true, true, false,
>> "glNamedBufferStorageMemEXT");
>> }
>> @@ -1937,7 +1958,8 @@ void GLAPIENTRY
>> _mesa_NamedBufferStorageMemEXT_no_error(GLuint buffer, GLsizeiptr size,
>> GLuint memory, GLuint64 offset)
>> {
>> -
>> + inlined_buffer_storage(GL_NONE, buffer, size, GL_NONE, 0, memory,
>> offset,
>> + true, true, true,
>> "glNamedBufferStorageMemEXT");
>> }
>> diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
>> index 085305c..4454d67 100644
>> --- a/src/mesa/main/bufferobj.h
>> +++ b/src/mesa/main/bufferobj.h
>> @@ -151,6 +151,9 @@ _mesa_ClearBufferSubData_sw(struct gl_context *ctx,
>> const GLvoid *clearValue,
>> GLsizeiptr clearValueSize,
>> struct gl_buffer_object *bufObj);
>> +extern void
>> +_mesa_bufferstorage_mem(GLenum target, GLsizeiptr size,
>> + const GLvoid *data, GLbitfield flags);
>
> Where is the function declared?
Looks like a left over WIP function. Dropped :)
>
>> /*
>> * API functions
>>
More information about the mesa-dev
mailing list