Mesa (master): swr: [rasterizer core] ensure adjacent topologies use the cut-aware PA

[Tim Rowley]

Module: Mesa
Branch: master
Commit: 036301596477a4b6b54e8e3f4ecf051860cbc7c3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=036301596477a4b6b54e8e3f4ecf051860cbc7c3

Author: Tim Rowley <timothy.o.rowley at intel.com>
Date:   Tue Jul 12 17:04:44 2016 -0600

swr: [rasterizer core] ensure adjacent topologies use the cut-aware PA

Signed-off-by: Tim Rowley <timothy.o.rowley at intel.com>

---

 src/gallium/drivers/swr/rasterizer/core/pa.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/swr/rasterizer/core/pa.h b/src/gallium/drivers/swr/rasterizer/core/pa.h
index 64932af..2b8110f 100644
--- a/src/gallium/drivers/swr/rasterizer/core/pa.h
+++ b/src/gallium/drivers/swr/rasterizer/core/pa.h
@@ -1159,14 +1159,11 @@ struct PA_FACTORY
         if ((IsIndexedT::value && IsCutIndexEnabledT::value && (
             topo == TOP_TRIANGLE_STRIP || topo == TOP_POINT_LIST ||
             topo == TOP_LINE_LIST || topo == TOP_LINE_STRIP ||
-            topo == TOP_TRIANGLE_LIST || topo == TOP_LINE_LIST_ADJ ||
-            topo == TOP_LISTSTRIP_ADJ || topo == TOP_TRI_LIST_ADJ ||
-            topo == TOP_TRI_STRIP_ADJ)) ||
+            topo == TOP_TRIANGLE_LIST)) ||
 
             // non-indexed draws with adjacency topologies must use cut-aware PA until we add support
             // for them in the optimized PA
-            (!IsIndexedT::value && (
-            topo == TOP_LINE_LIST_ADJ || topo == TOP_LISTSTRIP_ADJ || topo == TOP_TRI_LIST_ADJ || topo == TOP_TRI_STRIP_ADJ)))
+            (topo == TOP_LINE_LIST_ADJ || topo == TOP_LISTSTRIP_ADJ || topo == TOP_TRI_LIST_ADJ || topo == TOP_TRI_STRIP_ADJ))
         {
             memset(&indexStore, 0, sizeof(indexStore));
             uint32_t numAttribs = state.feNumAttributes;