From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Thu, 13 Apr 2017 18:53:17 +0000 (+0200)
Subject: mesa: fix remaining xfb prims check for GLES with multiple instances
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea9a8940cadb30ac8d72a26b82bdb54872c0e199;p=mesa.git

mesa: fix remaining xfb prims check for GLES with multiple instances

Found by inspection.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index af4f7cb4bf3..8f834324ad4 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -865,7 +865,7 @@ validate_draw_arrays(struct gl_context *ctx, const char *func,
    if (_mesa_is_gles3(ctx) && _mesa_is_xfb_active_and_unpaused(ctx) &&
        !_mesa_has_OES_geometry_shader(ctx) &&
        !_mesa_has_OES_tessellation_shader(ctx)) {
-      size_t prim_count = vbo_count_tessellated_primitives(mode, count, 1);
+      size_t prim_count = vbo_count_tessellated_primitives(mode, count, numInstances);
       if (xfb_obj->GlesRemainingPrims < prim_count) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "%s(exceeds transform feedback size)", func);