From a263a5a5a583d5acefc1e7c2799208ab4e91a15d Mon Sep 17 00:00:00 2001
From: fabian-l-c <66440964+fabian-l-c@users.noreply.github.com>
Date: Tue, 9 Jun 2020 16:11:22 -0300
Subject: [PATCH] Update directed case for drcSurround  in DRCtech.c

Before this modification "directed" surround rule only worked for layers1 and layers2 belonging to the same plane.
After this modification the "directed" rule works also for different planes, even if layer1 is a contact type.
---
 drc/DRCtech.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/drc/DRCtech.c b/drc/DRCtech.c
index f3d22699..2387fda0 100644
--- a/drc/DRCtech.c
+++ b/drc/DRCtech.c
@@ -2816,16 +2816,17 @@ drcSurround(argc, argv)
 	for (j = 0; j < DBNumTypes; j++)
 	{
 	    if (i == j) continue;	/* Ignore false edges */
-	    if (pset = (DBTypesOnSamePlane(i, j) & pmask2))
+	    
+	    if (isDirectional)
 	    {
-		if (isDirectional)
-		{
+		if (pset = (DBTypesOnSamePlane(i, j) & pmask))
+	    	{
 		    /* Directional surround is done entirely differently */
 
 		    if (TTMaskHasType(&setM, i) && TTMaskHasType(&invM, j))
 		    {
-			plane1 = LowestMaskBit(pmask);
-			plane2 = LowestMaskBit(pset);
+			plane1 = LowestMaskBit(pset);
+			plane2 = LowestMaskBit(pmask2);
 
 			/* Find bucket preceding the new one we wish to insert */
 			dp = drcFindBucket(i, j, distance);
@@ -2836,12 +2837,12 @@ drcSurround(argc, argv)
 				&DBAllTypeBits,
 				why, distance,
 				DRC_REVERSE | DRC_BOTHCORNERS,
-				plane1, plane2);
+				plane2, plane1);
 			dptrig = (DRCCookie *)mallocMagic(sizeof(DRCCookie));
 			drcAssign(dptrig, distance, dpnew, &set2,
 				&DBZeroTypeBits, why, 0,
 				DRC_FORWARD | DRC_TRIGGER,
-				plane1, plane2);
+				plane2, plane1);
 			dp->drcc_next = dptrig;
 
 			/* And the other direction. . . */
@@ -2853,17 +2854,20 @@ drcSurround(argc, argv)
 				&DBAllTypeBits,
 				why, distance,
 				DRC_FORWARD | DRC_BOTHCORNERS,
-				plane1, plane2);
+				plane2, plane1);
 			dptrig = (DRCCookie *)mallocMagic(sizeof(DRCCookie));
 			drcAssign(dptrig, distance, dpnew, &set2,
 				&DBZeroTypeBits, why, 0,
 				DRC_REVERSE | DRC_TRIGGER,
-				plane1, plane2);
+				plane2, plane1);
 			dp->drcc_next = dptrig;
 		    }
 		}
-		else
-		{
+	    }
+	    else
+	    {
+		if (pset = (DBTypesOnSamePlane(i, j) & pmask2))
+	    	{
 		    if (TTMaskHasType(&set1, i) && TTMaskHasType(&set2, j))
 		    {
 			plane1 = LowestMaskBit(pmask);