|
@@ -699,6 +699,7 @@ void convertARGB32bppToRGBA32bpp(unsigned char *image,
|
699
|
699
|
}
|
700
|
700
|
}
|
701
|
701
|
|
|
702
|
+GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
|
702
|
703
|
|
703
|
704
|
int Texture::loadBufferSlot(unsigned char *image,
|
704
|
705
|
unsigned int width, unsigned int height,
|
|
@@ -783,8 +784,9 @@ int Texture::loadBufferSlot(unsigned char *image,
|
783
|
784
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
|
784
|
785
|
GL_LINEAR_MIPMAP_LINEAR);
|
785
|
786
|
|
786
|
|
- gluBuild2DMipmaps(GL_TEXTURE_2D, bytes, width, height,
|
787
|
|
- glcMode, GL_UNSIGNED_BYTE, image);
|
|
787
|
+ //gluBuild2DMipmaps(GL_TEXTURE_2D, bytes, width, height, glcMode, GL_UNSIGNED_BYTE, image);
|
|
788
|
+ // gluBuild2DMipmaps is deprecated. Replacement by xythobuz
|
|
789
|
+ deprecated_gluBuild2DMipmaps(GL_TEXTURE_2D, bytes, width, height, glcMode, GL_UNSIGNED_BYTE, image);
|
788
|
790
|
}
|
789
|
791
|
else
|
790
|
792
|
{
|
|
@@ -800,6 +802,15 @@ int Texture::loadBufferSlot(unsigned char *image,
|
800
|
802
|
}
|
801
|
803
|
|
802
|
804
|
|
|
805
|
+// http://mmmovania.blogspot.de/2011/01/opengl-30-and-above-deprecated-func-and.html
|
|
806
|
+// http://www.g-truc.net/post-0256.html
|
|
807
|
+GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data) {
|
|
808
|
+ glTexParameteri(target, GL_GENERATE_MIPMAP, GL_TRUE);
|
|
809
|
+ glTexImage2D(target, 0, internalFormat, width, height, 0, format, type, data);
|
|
810
|
+ return 0;
|
|
811
|
+}
|
|
812
|
+
|
|
813
|
+
|
803
|
814
|
void Texture::bindTextureId(unsigned int n)
|
804
|
815
|
{
|
805
|
816
|
if ((int)n == mTextureId || !mTextureIds || n > mTextureCount)
|