From 56bac6cd80be692dbf0dd4f4ca0927c851ac3f2c Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 5 Apr 2011 21:30:25 +0000 Subject: [PATCH] - removed duplicate code that did nothing --- .../sources/graphics/gl/texture_gl.cpp | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/source/shared_lib/sources/graphics/gl/texture_gl.cpp b/source/shared_lib/sources/graphics/gl/texture_gl.cpp index 4b602867..3d8ce969 100644 --- a/source/shared_lib/sources/graphics/gl/texture_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/texture_gl.cpp @@ -737,19 +737,6 @@ void Texture1DGl::init(Filter filter, int maxAnisotropy) { if(error2 == GL_NO_ERROR) { error = GL_NO_ERROR; } - else { - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage1D( - GL_TEXTURE_1D, 0, glCompressionFormat, pixmap.getW(), - 0, glFormat, GL_UNSIGNED_BYTE, pixels); - - GLint error3= glGetError(); - if(error3 == GL_NO_ERROR) { - error = GL_NO_ERROR; - } - } } // @@ -893,18 +880,6 @@ void Texture2DGl::init(Filter filter, int maxAnisotropy) { if(error2 == GL_NO_ERROR) { error = GL_NO_ERROR; } - else { - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, 0, glCompressionFormat,pixmap.getW(), - pixmap.getH(),0, glFormat, GL_UNSIGNED_BYTE, pixels); - - GLint error3= glGetError(); - if(error3 == GL_NO_ERROR) { - error = GL_NO_ERROR; - } - } } // @@ -1150,16 +1125,6 @@ void TextureCubeGl::init(Filter filter, int maxAnisotropy) { if(error2 == GL_NO_ERROR) { error = GL_NO_ERROR; } - else { - glTexImage2D(target, 0, glCompressionFormat, - currentPixmap->getW(), currentPixmap->getH(), - 0, glFormat, GL_UNSIGNED_BYTE, pixels); - - int error3 = glGetError(); - if(error3 == GL_NO_ERROR) { - error = GL_NO_ERROR; - } - } } //