From c1fa6bbecf98c1514f5518381b7730653117fa63 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 Jan 2022 15:23:17 -0500 Subject: [PATCH] mesa: Remove unused _mesa_all_varyings_in_vbos Reviewed-by: Emma Anholt Part-of: --- src/mesa/main/arrayobj.c | 33 --------------------------------- src/mesa/main/arrayobj.h | 4 ---- 2 files changed, 37 deletions(-) diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 633ec2299ac..d28ead61fc0 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -818,39 +818,6 @@ _mesa_set_vao_immutable(struct gl_context *ctx, } -bool -_mesa_all_varyings_in_vbos(const struct gl_vertex_array_object *vao) -{ - /* Walk those enabled arrays that have the default vbo attached */ - GLbitfield mask = vao->Enabled & ~vao->VertexAttribBufferMask; - - while (mask) { - /* Do not use u_bit_scan64 as we can walk multiple - * attrib arrays at once - */ - const int i = ffs(mask) - 1; - const struct gl_array_attributes *attrib_array = - &vao->VertexAttrib[i]; - const struct gl_vertex_buffer_binding *buffer_binding = - &vao->BufferBinding[attrib_array->BufferBindingIndex]; - - /* We have already masked out vao->VertexAttribBufferMask */ - assert(!buffer_binding->BufferObj); - - /* Bail out once we find the first non vbo with a non zero stride */ - if (buffer_binding->Stride != 0) - return false; - - /* Note that we cannot use the xor variant since the _BoundArray mask - * may contain array attributes that are bound but not enabled. - */ - mask &= ~buffer_binding->_BoundArrays; - } - - return true; -} - - /** * Map buffer objects used in attribute arrays. */ diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 80e24ca4050..9763526b727 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -100,10 +100,6 @@ _mesa_set_vao_immutable(struct gl_context *ctx, struct gl_vertex_array_object *vao); -/* Returns true if all varying arrays reside in vbos */ -extern bool -_mesa_all_varyings_in_vbos(const struct gl_vertex_array_object *vao); - extern void _mesa_vao_map_arrays(struct gl_context *ctx, struct gl_vertex_array_object *vao, GLbitfield access);