diff options
| author | Mathias Fröhlich <[email protected]> | 2018-05-13 09:18:57 +0200 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-05-17 20:13:40 +0200 |
| commit | 6fac626193a077cba3154acf3820b30fc6f3e874 (patch) | |
| tree | fc17833e2679570c8b937ad4f59ce4d7fc37a361 | |
| parent | 984cb4e512f47fe6682f51985a0722c95e21f446 (diff) | |
mesa: The glArrayElement api is independent of the current program.
All the shader program dependent handling is done on the level
of the gl_Context::Array._DrawVAO/_DrawVAOEnabledAttribs.
So, skip array element invalidation on _NEW_PROGRAM.
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
| -rw-r--r-- | src/mesa/main/api_arrayelt.c | 2 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 2dfa74f64b3..afa30120211 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -1823,7 +1823,7 @@ _ae_invalidate_state(struct gl_context *ctx) * Luckily, neither the drivers nor tnl muck with the state that * concerns us here: */ - assert(ctx->NewState & (_NEW_ARRAY | _NEW_PROGRAM)); + assert(ctx->NewState & _NEW_ARRAY); assert(!actx->mapped_vbos); actx->dirty_state = true; diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index ee2e31ab7a2..cf9405df3dc 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -157,7 +157,7 @@ vbo_exec_invalidate_state(struct gl_context *ctx) struct vbo_context *vbo = vbo_context(ctx); struct vbo_exec_context *exec = &vbo->exec; - if (ctx->NewState & (_NEW_PROGRAM | _NEW_ARRAY)) { + if (ctx->NewState & _NEW_ARRAY) { _ae_invalidate_state(ctx); } if (ctx->NewState & _NEW_EVAL) |