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

mesa: fix incorrect uses of FLUSH_CURRENT

Browse Source 
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 <mathias.froehlich@web.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3766>
This commit is contained in:
Marek Olšák
2020-01-22 19:09:23 -05:00
committed by Marge Bot
parent 01443dc738
commit c7c8fe1cc1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/compute.c
View File

@@ -250,7 +250,7 @@ dispatch_compute(GLuint num_groups_x, GLuint num_groups_y,
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
const GLuint num_groups[3] = { num_groups_x, num_groups_y, num_groups_z }; 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) if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDispatchCompute(%d, %d, %d)\n", _mesa_debug(ctx, "glDispatchCompute(%d, %d, %d)\n",
@@ -285,7 +285,7 @@ dispatch_compute_indirect(GLintptr indirect, bool no_error)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
FLUSH_CURRENT(ctx, 0); FLUSH_VERTICES(ctx, 0);
if (MESA_VERBOSE & VERBOSE_API) if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDispatchComputeIndirect(%ld)\n", (long) indirect); _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 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 }; 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) if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, _mesa_debug(ctx,

2
src/mesa/main/context.c
View File

@@ -181,7 +181,7 @@ _mesa_notifySwapBuffers(struct gl_context *ctx)
{ {
if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS) if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS)
_mesa_debug(ctx, "SwapBuffers\n"); _mesa_debug(ctx, "SwapBuffers\n");
FLUSH_CURRENT( ctx, 0 ); FLUSH_VERTICES(ctx, 0);
if (ctx->Driver.Flush) { if (ctx->Driver.Flush) {
ctx->Driver.Flush(ctx); ctx->Driver.Flush(ctx);
} }