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

mesa/vbo: replace vbo_draw_method() with _mesa_set_drawing_arrays()

Browse Source 
The arrays specified by ctx->Array._DrawArrays are used for all
vertex drawing via vbo_context::draw_prims().  Different arrays are
used for immediate mode, vertex arrays, display lists, etc.  Changing
from one to another requires updating derived/driver array state.

Before, we indirectly specifid the arrays with the gl_draw_method values.
Now we just directly specify the arrays instead.  This is simpler and
will allow a subsequent display list optimization.

In the future, it might make sense to get rid of ctx->Array._DrawArrays
entirely and just pass the arrays as another parameter to
vbo_context::draw_prims().

Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
This commit is contained in:
Brian Paul
2018-01-24 09:14:35 -07:00
parent d9894ede02
commit 0d044f7d61
8 changed files with 34 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,20 +433,17 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, bool no_error)
newObj->EverBound = GL_TRUE;
}
if (ctx->Array.DrawMethod == DRAW_ARRAYS) {
/* The _DrawArrays pointer is pointing at the VAO being unbound and
* that VAO may be in the process of being deleted. If it's not going
* to be deleted, this will have no effect, because the pointer needs
* to be updated by the VBO module anyway.
*
* Before the VBO module can update the pointer, we have to set it
* to NULL for drivers not to set up arrays which are not bound,
* or to prevent a crash if the VAO being unbound is going to be
* deleted.
*/
ctx->Array._DrawArrays = NULL;
ctx->Array.DrawMethod = DRAW_NONE;
}
/* The _DrawArrays pointer is pointing at the VAO being unbound and
* that VAO may be in the process of being deleted. If it's not going
* to be deleted, this will have no effect, because the pointer needs
* to be updated by the VBO module anyway.
*
* Before the VBO module can update the pointer, we have to set it
* to NULL for drivers not to set up arrays which are not bound,
* or to prevent a crash if the VAO being unbound is going to be
* deleted.
*/
_mesa_set_drawing_arrays(ctx, NULL);
ctx->NewState |= _NEW_ARRAY;
_mesa_reference_vao(ctx, &ctx->Array.VAO, newObj);