From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Tue, 9 Jun 2015 22:18:13 +0000 (-0700)
Subject: mesa/swrast: Use global function _mesa_regions_overlap()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca21c9ab28df24ef015ead28df1dcccd90387df6;p=mesa.git

mesa/swrast: Use global function _mesa_regions_overlap()

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 68c83e44e12..8fde0c29540 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -27,6 +27,7 @@
 #include "main/context.h"
 #include "main/condrender.h"
 #include "main/macros.h"
+#include "main/blit.h"
 #include "main/pixeltransfer.h"
 #include "main/imports.h"
 
@@ -52,19 +53,8 @@ regions_overlap(GLint srcx, GLint srcy,
                 GLfloat zoomX, GLfloat zoomY)
 {
    if (zoomX == 1.0 && zoomY == 1.0) {
-      /* no zoom */
-      if (srcx >= dstx + width || (srcx + width <= dstx)) {
-         return GL_FALSE;
-      }
-      else if (srcy < dsty) { /* this is OK */
-         return GL_FALSE;
-      }
-      else if (srcy > dsty + height) {
-         return GL_FALSE;
-      }
-      else {
-         return GL_TRUE;
-      }
+      return _mesa_regions_overlap(srcx, srcy, srcx + width, srcy + height,
+                                   dstx, dsty, dstx + width, dsty + height);
    }
    else {
       /* add one pixel of slop when zooming, just to be safe */