KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove constant drawID parameter from _mesa_draw_arrays 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7441>
This commit is contained in:
Marek Olšák 2020-11-01 15:45:52 -05:00 committed by Marge Bot
parent 7a8880f871
commit 6dd8b6518e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/main/draw.c
View File

@ -346,8 +346,7 @@ enabled_filter(const struct gl_context *ctx)
*/ */
static void static void
_mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start, _mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,
GLsizei count, GLuint numInstances, GLuint baseInstance, GLsizei count, GLuint numInstances, GLuint baseInstance)
GLuint drawID)
{ {
if (skip_validated_draw(ctx)) if (skip_validated_draw(ctx))
return; return;
@ -359,7 +358,7 @@ _mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,
.begin = 1, .begin = 1,
.end = 1, .end = 1,
.mode = mode, .mode = mode,
.draw_id = drawID, .draw_id = 0,
.start = start, .start = start,
.count = count, .count = count,
}; };
@ -580,7 +579,7 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
if (0) if (0)
check_draw_arrays_data(ctx, start, count); check_draw_arrays_data(ctx, start, count);
_mesa_draw_arrays(ctx, mode, start, count, 1, 0, 0); _mesa_draw_arrays(ctx, mode, start, count, 1, 0);
if (0) if (0)
print_draw_arrays(ctx, mode, start, count); print_draw_arrays(ctx, mode, start, count);
@ -617,7 +616,7 @@ _mesa_DrawArraysInstancedARB(GLenum mode, GLint start, GLsizei count,
if (0) if (0)
check_draw_arrays_data(ctx, start, count); check_draw_arrays_data(ctx, start, count);
_mesa_draw_arrays(ctx, mode, start, count, numInstances, 0, 0); _mesa_draw_arrays(ctx, mode, start, count, numInstances, 0);
if (0) if (0)
print_draw_arrays(ctx, mode, start, count); print_draw_arrays(ctx, mode, start, count);
@ -656,7 +655,7 @@ _mesa_DrawArraysInstancedBaseInstance(GLenum mode, GLint first,
if (0) if (0)
check_draw_arrays_data(ctx, first, count); check_draw_arrays_data(ctx, first, count);
_mesa_draw_arrays(ctx, mode, first, count, numInstances, baseInstance, 0); _mesa_draw_arrays(ctx, mode, first, count, numInstances, baseInstance);
if (0) if (0)
print_draw_arrays(ctx, mode, first, count); print_draw_arrays(ctx, mode, first, count);
@ -1430,7 +1429,7 @@ _mesa_draw_transform_feedback(struct gl_context *ctx, GLenum mode,
!_mesa_all_varyings_in_vbos(ctx->Array.VAO))) { !_mesa_all_varyings_in_vbos(ctx->Array.VAO))) {
GLsizei n = GLsizei n =
ctx->Driver.GetTransformFeedbackVertexCount(ctx, obj, stream); ctx->Driver.GetTransformFeedbackVertexCount(ctx, obj, stream);
_mesa_draw_arrays(ctx, mode, 0, n, numInstances, 0, 0); _mesa_draw_arrays(ctx, mode, 0, n, numInstances, 0);
return; return;
} }