Clean up ClipRectangle

src/libANGLE/angletypes.cpp

@@ -202,28 +202,16 @@ bool ClipRectangle(const Rectangle &source, const Rectangle &clip, Rectangle *in
 
     if (minSourceX >= maxClipX || maxSourceX <= minClipX || minSourceY >= maxClipY || maxSourceY <= minClipY)
     {
-        if (intersection)
-        {
-            intersection->x = minSourceX;
-            intersection->y = maxSourceY;
-            intersection->width = maxSourceX - minSourceX;
-            intersection->height = maxSourceY - minSourceY;
-        }
-
         return false;
     }
-    else
+    if (intersection)
     {
-        if (intersection)
-        {
-            intersection->x = std::max(minSourceX, minClipX);
-            intersection->y = std::max(minSourceY, minClipY);
-            intersection->width  = std::min(maxSourceX, maxClipX) - std::max(minSourceX, minClipX);
-            intersection->height = std::min(maxSourceY, maxClipY) - std::max(minSourceY, minClipY);
-        }
-
-        return true;
+        intersection->x = std::max(minSourceX, minClipX);
+        intersection->y = std::max(minSourceY, minClipY);
+        intersection->width  = std::min(maxSourceX, maxClipX) - std::max(minSourceX, minClipX);
+        intersection->height = std::min(maxSourceY, maxClipY) - std::max(minSourceY, minClipY);
     }
+    return true;
 }
 
 bool Box::operator==(const Box &other) const

src/libANGLE/renderer/d3d/d3d11/Blit11.cpp

@@ -1498,7 +1498,10 @@ gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source,
     // Clip dest area to the scissor
     if (scissor)
     {
-        gl::ClipRectangle(clipRect, *scissor, &clipRect);
+        if (!gl::ClipRectangle(clipRect, *scissor, &clipRect))
+        {
+            return gl::NoError();
+        }
     }
 
     convertFunction(sourceArea, destArea, clipRect, sourceSize, sourceMapping.RowPitch,