diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
| commit | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (patch) | |
| tree | 72ea4c93cc3337810a32ccc0fb34b3bd96d933e9 /mesalib/src/mesa/main/fbobject.c | |
| parent | e3710c8691dceaccf51bb80e5a1f7d1830758f7e (diff) | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.gz vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.bz2 vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index f8b148cee..5b329f5c3 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -78,14 +78,6 @@ static struct gl_renderbuffer DummyRenderbuffer; static struct gl_framebuffer IncompleteFramebuffer; -static inline GLboolean -is_cube_face(GLenum target) -{ - return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && - target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z); -} - - /** * Is the given FBO a user-created FBO? */ @@ -2008,7 +2000,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } else { err = (texObj->Target == GL_TEXTURE_CUBE_MAP) - ? !is_cube_face(textarget) + ? !_mesa_is_cube_face(textarget) : (texObj->Target != textarget); } } |