KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/swrast: Use global function _mesa_regions_overlap() 

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Anuj Phogat 2015-06-09 15:18:13 -07:00
parent 2a397c7958
commit ca21c9ab28
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/swrast/s_copypix.c
View File

@ -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 */