diff options
| author | Marek Olšák <[email protected]> | 2020-01-22 19:09:23 -0500 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-02-11 00:34:57 +0000 |
| commit | c7c8fe1cc1a972e59885cc14778dbf5a520f48dd (patch) | |
| tree | baa6d6fb03659ec4943724a9bd1d434ec07dff70 /src/mesa | |
| parent | 01443dc7383f4634e4a66fa194ed51db74186128 (diff) | |
mesa: fix incorrect uses of FLUSH_CURRENT
FLUSH_CURRENT is used to copy attributes from the vbo module to
Current.Attrib. It flushes vertices too, but that's a side effect,
not the intent.
Reviewed-by: Mathias Fröhlich <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3766>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/compute.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/compute.c b/src/mesa/main/compute.c index cbd166b1095..84ae7562c30 100644 --- a/src/mesa/main/compute.c +++ b/src/mesa/main/compute.c @@ -250,7 +250,7 @@ dispatch_compute(GLuint num_groups_x, GLuint num_groups_y, GET_CURRENT_CONTEXT(ctx); const GLuint num_groups[3] = { num_groups_x, num_groups_y, num_groups_z }; - FLUSH_CURRENT(ctx, 0); + FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glDispatchCompute(%d, %d, %d)\n", @@ -285,7 +285,7 @@ dispatch_compute_indirect(GLintptr indirect, bool no_error) { GET_CURRENT_CONTEXT(ctx); - FLUSH_CURRENT(ctx, 0); + FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glDispatchComputeIndirect(%ld)\n", (long) indirect); @@ -318,7 +318,7 @@ dispatch_compute_group_size(GLuint num_groups_x, GLuint num_groups_y, const GLuint num_groups[3] = { num_groups_x, num_groups_y, num_groups_z }; const GLuint group_size[3] = { group_size_x, group_size_y, group_size_z }; - FLUSH_CURRENT(ctx, 0); + FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index a5bf99a266d..db34c941329 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -181,7 +181,7 @@ _mesa_notifySwapBuffers(struct gl_context *ctx) { if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS) _mesa_debug(ctx, "SwapBuffers\n"); - FLUSH_CURRENT( ctx, 0 ); + FLUSH_VERTICES(ctx, 0); if (ctx->Driver.Flush) { ctx->Driver.Flush(ctx); } |