diff options
| author | Brian Paul <[email protected]> | 2018-01-24 09:14:35 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-01-29 08:35:14 -0700 |
| commit | 0d044f7d619c56c67d8235312363d93e2362248f (patch) | |
| tree | 14c151223842438d386f5369075b007f44d4c377 /src/mesa/main/attrib.c | |
| parent | d9894ede02d13735c62da3e0ace9e9c647e2956a (diff) | |
mesa/vbo: replace vbo_draw_method() with _mesa_set_drawing_arrays()
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 <[email protected]>
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 0fdadaf0aaa..50b65c413e5 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1538,9 +1538,8 @@ copy_array_attrib(struct gl_context *ctx, /* skip ArrayBufferObj */ /* skip IndexBufferObj */ - /* Invalidate draw state. It will be updated during the next draw. */ - dest->DrawMethod = DRAW_NONE; - dest->_DrawArrays = NULL; + /* Invalidate array state. It will be updated during the next draw. */ + _mesa_set_drawing_arrays(ctx, NULL); } /** |