diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-09 14:12:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-01-20 10:53:18 +1000 |
| commit | addcc24f77229ca3a864a1774a681f96699d09c2 (patch) | |
| tree | 570726e21330a640c74b5c8ec413c6ed544431f4 /src/mesa/state_tracker/st_cb_texture.c | |
| parent | ed0046c5b47e9a7983d5331bd97ea7c91582b0fd (diff) | |
mesa/st: merge memoryobjects code from st into mesa
This takes all the memory object code from state tracker and
merges it into mesa, cleaning it up on the way.
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14327>
Diffstat (limited to 'src/mesa/state_tracker/st_cb_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 1a95e0933c6..ca49abb74f8 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -56,7 +56,6 @@ #include "state_tracker/st_cb_fbo.h" #include "state_tracker/st_cb_flush.h" #include "state_tracker/st_cb_texture.h" -#include "state_tracker/st_cb_memoryobjects.h" #include "state_tracker/st_format.h" #include "state_tracker/st_pbo.h" #include "state_tracker/st_texture.h" @@ -3192,7 +3191,7 @@ st_finalize_texture(struct gl_context *ctx, */ static struct pipe_resource * st_texture_create_from_memory(struct st_context *st, - struct st_memory_object *memObj, + struct gl_memory_object *memObj, GLuint64 offset, enum pipe_texture_target target, enum pipe_format format, @@ -3264,7 +3263,6 @@ st_texture_storage(struct gl_context *ctx, struct gl_texture_image *texImage = texObj->Image[0][0]; struct st_context *st = st_context(ctx); struct st_texture_object *stObj = st_texture_object(texObj); - struct st_memory_object *smObj = st_memory_object(memObj); struct pipe_screen *screen = st->screen; unsigned ptWidth, bindings; uint16_t ptHeight, ptDepth, ptLayers; @@ -3280,8 +3278,8 @@ st_texture_storage(struct gl_context *ctx, bindings = default_bindings(st, fmt); - if (smObj) { - smObj->TextureTiling = texObj->TextureTiling; + if (memObj) { + memObj->TextureTiling = texObj->TextureTiling; bindings |= PIPE_BIND_SHARED; } @@ -3320,9 +3318,9 @@ st_texture_storage(struct gl_context *ctx, pipe_resource_reference(&stObj->pt, NULL); - if (smObj) { + if (memObj) { stObj->pt = st_texture_create_from_memory(st, - smObj, + memObj, offset, gl_target_to_pipe(texObj->Target), fmt, |