OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: shrink VERT_ATTRIB bitfields to 32 bits

Browse Source 
There are only 32 vertex attribs now.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák
2017-11-15 23:53:04 +01:00
parent 43abaf2ad0
commit 78942e7dbf
14 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/main/arrayobj.c
View File

@@ -252,7 +252,7 @@ init_array(struct gl_context *ctx,
binding->Offset = 0;
binding->Stride = array->_ElementSize;
binding->BufferObj = NULL;
binding->_BoundArrays = BITFIELD64_BIT(index);
binding->_BoundArrays = BITFIELD_BIT(index);
/* Vertex array buffers */
_mesa_reference_buffer_object(ctx, &binding->BufferObj,
@@ -314,10 +314,10 @@ void
_mesa_update_vao_client_arrays(struct gl_context *ctx,
struct gl_vertex_array_object *vao)
{
GLbitfield64 arrays = vao->NewArrays;
GLbitfield arrays = vao->NewArrays;
while (arrays) {
const int attrib = u_bit_scan64(&arrays);
const int attrib = u_bit_scan(&arrays);
struct gl_vertex_array *client_array = &vao->_VertexAttrib[attrib];
const struct gl_array_attributes *attrib_array =
&vao->VertexAttrib[attrib];
@@ -334,13 +334,13 @@ bool
_mesa_all_varyings_in_vbos(const struct gl_vertex_array_object *vao)
{
/* Walk those enabled arrays that have the default vbo attached */
GLbitfield64 mask = vao->_Enabled & ~vao->VertexAttribBufferMask;
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 = ffsll(mask) - 1;
const int i = ffs(mask) - 1;
const struct gl_array_attributes *attrib_array =
&vao->VertexAttrib[i];
const struct gl_vertex_buffer_binding *buffer_binding =
@@ -368,10 +368,10 @@ bool
_mesa_all_buffers_are_unmapped(const struct gl_vertex_array_object *vao)
{
/* Walk the enabled arrays that have a vbo attached */
GLbitfield64 mask = vao->_Enabled & vao->VertexAttribBufferMask;
GLbitfield mask = vao->_Enabled & vao->VertexAttribBufferMask;
while (mask) {
const int i = ffsll(mask) - 1;
const int i = ffs(mask) - 1;
const struct gl_array_attributes *attrib_array =
&vao->VertexAttrib[i];
const struct gl_vertex_buffer_binding *buffer_binding =