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:
parent
2a397c7958
commit
ca21c9ab28
|
@ -27,6 +27,7 @@
|
||||||
#include "main/context.h"
|
#include "main/context.h"
|
||||||
#include "main/condrender.h"
|
#include "main/condrender.h"
|
||||||
#include "main/macros.h"
|
#include "main/macros.h"
|
||||||
|
#include "main/blit.h"
|
||||||
#include "main/pixeltransfer.h"
|
#include "main/pixeltransfer.h"
|
||||||
#include "main/imports.h"
|
#include "main/imports.h"
|
||||||
|
|
||||||
|
@ -52,19 +53,8 @@ regions_overlap(GLint srcx, GLint srcy,
|
||||||
GLfloat zoomX, GLfloat zoomY)
|
GLfloat zoomX, GLfloat zoomY)
|
||||||
{
|
{
|
||||||
if (zoomX == 1.0 && zoomY == 1.0) {
|
if (zoomX == 1.0 && zoomY == 1.0) {
|
||||||
/* no zoom */
|
return _mesa_regions_overlap(srcx, srcy, srcx + width, srcy + height,
|
||||||
if (srcx >= dstx + width || (srcx + width <= dstx)) {
|
dstx, dsty, dstx + width, dsty + height);
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* add one pixel of slop when zooming, just to be safe */
|
/* add one pixel of slop when zooming, just to be safe */
|
||||||
|
|
Loading…
Reference in New Issue