From: George Kyriazis <george.kyriazis@intel.com>
Date: Wed, 31 Jan 2018 23:07:59 +0000 (-0600)
Subject: swr/rast: Fix invalid number of attributes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5df4d987806fc14fc614a7f0bb110bb1939d7580;p=mesa.git

swr/rast: Fix invalid number of attributes

Fix invalid number of attributes passed into tesselation PA.
Needs to take into account any offsets from the shader.
Innocuous issue, but removes an assert firing in debug.

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
index c44dd2c2da0..33533af630a 100644
--- a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
@@ -1334,7 +1334,7 @@ static void TessellationStages(
             dsContext.vectorStride,
 #endif
             SWR_VTX_NUM_SLOTS,
-            tsState.numDsOutputAttribs,
+            tsState.numDsOutputAttribs + tsState.dsOutVtxAttribOffset,
             tsData.ppIndices,
             tsData.NumPrimitives,
             tsState.postDSTopology,