diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-16 16:04:50 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-01-16 16:04:50 +0000 |
commit | 72574b959c39981033069e367a12c5ae595dd93a (patch) | |
tree | db0d0b11b8e0ced10e22c94d6c4f3377e81b2042 | |
parent | 78940758e90069ceaca2b6cddb6438488fbad5cc (diff) |
added another test in regions_overlap() (Klaus)
-rw-r--r-- | src/mesa/swrast/s_copypix.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index d2d93a944..7ed59ab7d 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -1,10 +1,10 @@ -/* $Id: s_copypix.c,v 1.27 2002/01/10 16:54:29 brianp Exp $ */ +/* $Id: s_copypix.c,v 1.28 2002/01/16 16:04:50 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -67,6 +67,9 @@ regions_overlap(GLint srcx, GLint srcy, else if (srcy < dsty) { /* this is OK */ return GL_FALSE; } + else if (srcy > dsty + height) { + return GL_FALSE; + } else { return GL_TRUE; } |