mesa/st: merge st buffer object into GL

Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14133>
2021-12-09 11:37:58 +10:00
parent 1c4f76672d
commit 970daedb1d
17 changed files with 107 additions and 146 deletions
--- a/src/mesa/state_tracker/st_atom_atomicbuf.c
+++ b/src/mesa/state_tracker/st_atom_atomicbuf.c
@@ -44,8 +44,7 @@ static void
 st_binding_to_sb(struct gl_buffer_binding *binding,
                 struct pipe_shader_buffer *sb)
 {
-   struct st_buffer_object *st_obj =
-      st_buffer_object(binding->BufferObject);
+   struct gl_buffer_object *st_obj = binding->BufferObject;

   if (st_obj && st_obj->buffer) {
     sb->buffer = st_obj->buffer;