swr: [rasterizer core] ensure adjacent topologies use the cut-aware PA
authorTim Rowley <timothy.o.rowley@intel.com>
Tue, 12 Jul 2016 23:04:44 +0000 (17:04 -0600)
committerTim Rowley <timothy.o.rowley@intel.com>
Wed, 20 Jul 2016 15:22:15 +0000 (10:22 -0500)
Signed-off-by: Tim Rowley <timothy.o.rowley@intel.com>
src/gallium/drivers/swr/rasterizer/core/pa.h

index 64932af61456cbeb74bacbec21615264ead5cd01..2b8110f4c7092f1bfca356419da7a90693a2b6d1 100644 (file)
@@ -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;