Mesa (main): mesa/st: make static the buffer object funcs that can be
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Dec 15 14:02:49 UTC 2021
Module: Mesa
Branch: main
Commit: f6840bb940686adc5d06b2af21c1cb44cc32a9bf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6840bb940686adc5d06b2af21c1cb44cc32a9bf
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 9 13:04:33 2021 +1000
mesa/st: make static the buffer object funcs that can be
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14133>
---
src/mesa/main/bufferobj.c | 52 +++++++++++++++++++++++------------------------
src/mesa/main/bufferobj.h | 25 -----------------------
2 files changed, 26 insertions(+), 51 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 50846cc6b69..1d8fdc692bb 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -125,11 +125,11 @@ st_bufferobj_subdata(struct gl_context *ctx,
/**
* Called via glGetBufferSubDataARB().
*/
-void
-st_bufferobj_get_subdata(struct gl_context *ctx,
- GLintptrARB offset,
- GLsizeiptrARB size,
- void * data, struct gl_buffer_object *obj)
+static void
+bufferobj_get_subdata(struct gl_context *ctx,
+ GLintptrARB offset,
+ GLsizeiptrARB size,
+ void *data, struct gl_buffer_object *obj)
{
/* we may be called from VBO code, so double-check params here */
assert(offset >= 0);
@@ -396,7 +396,7 @@ st_bufferobj_data(struct gl_context *ctx,
return bufferobj_data(ctx, target, size, data, NULL, 0, usage, storageFlags, obj);
}
-GLboolean
+static GLboolean
st_bufferobj_data_mem(struct gl_context *ctx,
GLenum target,
GLsizeiptrARB size,
@@ -553,8 +553,8 @@ st_bufferobj_unmap(struct gl_context *ctx, struct gl_buffer_object *obj,
/**
* Called via glCopyBufferSubData().
*/
-void
-st_copy_buffer_subdata(struct gl_context *ctx,
+static void
+copy_buffer_subdata(struct gl_context *ctx,
struct gl_buffer_object *src,
struct gl_buffer_object *dst,
GLintptr readOffset, GLintptr writeOffset,
@@ -579,8 +579,8 @@ st_copy_buffer_subdata(struct gl_context *ctx,
/**
* Called via glClearBufferSubData().
*/
-void
-st_clear_buffer_subdata(struct gl_context *ctx,
+static void
+clear_buffer_subdata(struct gl_context *ctx,
GLintptr offset, GLsizeiptr size,
const void *clearValue,
GLsizeiptr clearValueSize,
@@ -602,8 +602,8 @@ st_clear_buffer_subdata(struct gl_context *ctx,
clearValue, clearValueSize);
}
-void
-st_bufferobj_page_commitment(struct gl_context *ctx,
+static void
+bufferobj_page_commitment(struct gl_context *ctx,
struct gl_buffer_object *bufferObj,
GLintptr offset, GLsizeiptr size,
GLboolean commit)
@@ -2819,7 +2819,7 @@ _mesa_GetBufferSubData(GLenum target, GLintptr offset,
return;
}
- st_bufferobj_get_subdata(ctx, offset, size, data, bufObj);
+ bufferobj_get_subdata(ctx, offset, size, data, bufObj);
}
void GLAPIENTRY
@@ -2839,7 +2839,7 @@ _mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset,
return;
}
- st_bufferobj_get_subdata(ctx, offset, size, data, bufObj);
+ bufferobj_get_subdata(ctx, offset, size, data, bufObj);
}
@@ -2866,7 +2866,7 @@ _mesa_GetNamedBufferSubDataEXT(GLuint buffer, GLintptr offset,
return;
}
- st_bufferobj_get_subdata(ctx, offset, size, data, bufObj);
+ bufferobj_get_subdata(ctx, offset, size, data, bufObj);
}
/**
@@ -2915,8 +2915,8 @@ clear_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
if (data == NULL) {
/* clear to zeros, per the spec */
- st_clear_buffer_subdata(ctx, offset, size,
- NULL, clearValueSize, bufObj);
+ clear_buffer_subdata(ctx, offset, size,
+ NULL, clearValueSize, bufObj);
return;
}
@@ -2925,8 +2925,8 @@ clear_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
return;
}
- st_clear_buffer_subdata(ctx, offset, size,
- clearValue, clearValueSize, bufObj);
+ clear_buffer_subdata(ctx, offset, size,
+ clearValue, clearValueSize, bufObj);
}
static void
@@ -3521,7 +3521,7 @@ copy_buffer_sub_data(struct gl_context *ctx, struct gl_buffer_object *src,
dst->MinMaxCacheDirty = true;
- st_copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset, size);
+ copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset, size);
}
void GLAPIENTRY
@@ -3538,8 +3538,8 @@ _mesa_CopyBufferSubData_no_error(GLenum readTarget, GLenum writeTarget,
struct gl_buffer_object *dst = *dst_ptr;
dst->MinMaxCacheDirty = true;
- st_copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset,
- size);
+ copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset,
+ size);
}
void GLAPIENTRY
@@ -3599,8 +3599,8 @@ _mesa_CopyNamedBufferSubData_no_error(GLuint readBuffer, GLuint writeBuffer,
struct gl_buffer_object *dst = _mesa_lookup_bufferobj(ctx, writeBuffer);
dst->MinMaxCacheDirty = true;
- st_copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset,
- size);
+ copy_buffer_subdata(ctx, src, dst, readOffset, writeOffset,
+ size);
}
void GLAPIENTRY
@@ -3659,7 +3659,7 @@ _mesa_InternalBufferSubDataCopyMESA(GLintptr srcBuffer, GLuint srcOffset,
goto done; /* the error is already set */
dst->MinMaxCacheDirty = true;
- st_copy_buffer_subdata(ctx, src, dst, srcOffset, dstOffset, size);
+ copy_buffer_subdata(ctx, src, dst, srcOffset, dstOffset, size);
done:
/* The caller passes the reference to this function, so unreference it. */
@@ -5398,7 +5398,7 @@ buffer_page_commitment(struct gl_context *ctx,
return;
}
- st_bufferobj_page_commitment(ctx, bufferObj, offset, size, commit);
+ bufferobj_page_commitment(ctx, bufferObj, offset, size, commit);
}
void GLAPIENTRY
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f7b417372fe..948e25580e0 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -72,10 +72,6 @@ void st_bufferobj_subdata(struct gl_context *ctx,
GLintptrARB offset,
GLsizeiptrARB size,
const void * data, struct gl_buffer_object *obj);
-void st_bufferobj_get_subdata(struct gl_context *ctx,
- GLintptrARB offset,
- GLsizeiptrARB size,
- void * data, struct gl_buffer_object *obj);
GLboolean st_bufferobj_data(struct gl_context *ctx,
GLenum target,
GLsizeiptrARB size,
@@ -83,13 +79,6 @@ GLboolean st_bufferobj_data(struct gl_context *ctx,
GLenum usage,
GLbitfield storageFlags,
struct gl_buffer_object *obj);
-GLboolean st_bufferobj_data_mem(struct gl_context *ctx,
- GLenum target,
- GLsizeiptrARB size,
- struct gl_memory_object *memObj,
- GLuint64 offset,
- GLenum usage,
- struct gl_buffer_object *bufObj);
void *st_bufferobj_map_range(struct gl_context *ctx,
GLintptr offset, GLsizeiptr length,
GLbitfield access,
@@ -102,20 +91,6 @@ void st_bufferobj_flush_mapped_range(struct gl_context *ctx,
gl_map_buffer_index index);
GLboolean st_bufferobj_unmap(struct gl_context *ctx, struct gl_buffer_object *obj,
gl_map_buffer_index index);
-void st_copy_buffer_subdata(struct gl_context *ctx,
- struct gl_buffer_object *src,
- struct gl_buffer_object *dst,
- GLintptr readOffset, GLintptr writeOffset,
- GLsizeiptr size);
-void st_clear_buffer_subdata(struct gl_context *ctx,
- GLintptr offset, GLsizeiptr size,
- const void *clearValue,
- GLsizeiptr clearValueSize,
- struct gl_buffer_object *bufObj);
-void st_bufferobj_page_commitment(struct gl_context *ctx,
- struct gl_buffer_object *bufferObj,
- GLintptr offset, GLsizeiptr size,
- GLboolean commit);
struct gl_buffer_object *
_mesa_internal_buffer_object_alloc(struct gl_context *ctx, GLuint id);
More information about the mesa-commit
mailing list