diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-29 13:47:34 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-29 13:47:34 +0100 |
| commit | c14f2432d6bfb3de6c6289efd0471f038a289327 (patch) | |
| tree | 8864ad1e5d0ae65dd665aa45245f2dab86c3f178 /mesalib/src/mesa/main/teximage.c | |
| parent | 8475e285d0146b123f0ac1a87294c42088af12b0 (diff) | |
| parent | 15a500d3edb03668b43cc6898fafcda024d0f006 (diff) | |
| download | vcxsrv-c14f2432d6bfb3de6c6289efd0471f038a289327.tar.gz vcxsrv-c14f2432d6bfb3de6c6289efd0471f038a289327.tar.bz2 vcxsrv-c14f2432d6bfb3de6c6289efd0471f038a289327.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 9b6c6c896..5328ae296 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -69,8 +69,6 @@ * * This is the format which is used during texture application (i.e. the * texture format and env mode determine the arithmetic used. - * - * XXX this could be static */ GLint _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) @@ -830,7 +828,7 @@ _mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level) struct gl_texture_image *texImage; GLuint texIndex; - if (level < 0 ) + if (level < 0) return NULL; switch (target) { |