diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-12-19 01:41:04 -0500 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2021-01-30 16:23:53 -0500 |
| commit | a4490541c699c3dd2863f71733ba3ac9d2be7165 (patch) | |
| tree | d868e9148e9b56e1bea1e8221a26fc0dd67b2ba6 | |
| parent | 85d300ecd1405eabca7434df04ae3dc6e919e874 (diff) | |
mesa: remove/replace FLUSH_VERTICES when it doesn't do anything
In _mesa_PopAttrib, we call FLUSH_VERTICES at the beginning, so we don't
need to do it again.
In the MultiMode functions, we call standard Draw functions
using the dispatch, which do the flushing by themselves.
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8181>
| -rw-r--r-- | src/mesa/main/attrib.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/draw.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index b1180ac6741..0002be808f6 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -924,7 +924,7 @@ _mesa_PopAttrib(void) (GLfloat) attr->Light.Model.ColorControl); } else { /* Fast path for other drivers. */ - FLUSH_VERTICES(ctx, _NEW_LIGHT); + ctx->NewState |= _NEW_LIGHT; memcpy(ctx->Light.LightSource, attr->Light.LightSource, sizeof(attr->Light.LightSource)); diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index 343b8439dc7..7a0cec6307e 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -2184,8 +2184,6 @@ _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first, GET_CURRENT_CONTEXT(ctx); GLint i; - FLUSH_VERTICES(ctx, 0); - for ( i = 0 ; i < primcount ; i++ ) { if ( count[i] > 0 ) { GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride)); @@ -2204,10 +2202,6 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count, GET_CURRENT_CONTEXT(ctx); GLint i; - FLUSH_VERTICES(ctx, 0); - - /* XXX not sure about ARB_vertex_buffer_object handling here */ - for ( i = 0 ; i < primcount ; i++ ) { if ( count[i] > 0 ) { GLenum m = *((GLenum *) ((GLubyte *) mode + i * modestride)); |