From: George Kyriazis <george.kyriazis@intel.com>
Date: Thu, 26 Apr 2018 21:12:24 +0000 (-0500)
Subject: swr/rast: Use binner topology to assemble backend attributes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70f0a28b83d9977e106f80cfd033e0796bc43f2f;p=mesa.git

swr/rast: Use binner topology to assemble backend attributes

Previously was using the draw topology, which may change if GS or Tess
are active. Only affected attributes marked with constant interpolation,
which limited the impact.

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

diff --git a/src/gallium/drivers/swr/rasterizer/core/binner.cpp b/src/gallium/drivers/swr/rasterizer/core/binner.cpp
index 9f8dc887aa6..7b9c20ef802 100644
--- a/src/gallium/drivers/swr/rasterizer/core/binner.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/binner.cpp
@@ -81,7 +81,7 @@ INLINE void ProcessAttributes(
     // Conservative Rasterization requires degenerate tris to have constant attribute interpolation
     uint32_t constantInterpMask = IsDegenerate::value ? 0xFFFFFFFF : backendState.constantInterpolationMask;
     const uint32_t provokingVertex = pDC->pState->state.frontendState.topologyProvokingVertex;
-    const PRIMITIVE_TOPOLOGY topo = pDC->pState->state.topology;
+    const PRIMITIVE_TOPOLOGY topo = pa.binTopology;
 
     static const float constTable[3][4] = {
         { 0.0f, 0.0f, 0.0f, 0.0f },