[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49974] trunk/blender/source: Moving more duplicate code from GPU_create_gl_tex_compressed() and BL_Texture::InitGLCompressedTex() into GPU_Upload_dxt_texture().

[Mitchell Stokes]

Revision: 49974
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49974
Author:   moguri
Date:     2012-08-18 03:32:28 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Moving more duplicate code from GPU_create_gl_tex_compressed() and BL_Texture::InitGLCompressedTex() into GPU_Upload_dxt_texture(). This reduces code duplication and ensures that both paths are using the same settings.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-08-18 03:24:41 UTC (rev 49973)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-08-18 03:32:28 UTC (rev 49974)
@@ -730,6 +730,11 @@
 		return FALSE;
 	}
 
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
+
+	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+
 	blocksize = (format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) ? 8 : 16;
 	for (i=0; i<ibuf->dds_data.nummipmaps && (width||height); ++i) {
 		if (width == 0)
@@ -766,11 +771,6 @@
 	glGenTextures(1, (GLuint *)bind);
 	glBindTexture(GL_TEXTURE_2D, *bind);
 
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
-
-	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
 	if (GPU_upload_dxt_texture(ibuf) == 0) {
 		glDeleteTextures(1, (GLuint*)bind);
 		GPU_create_gl_tex(bind, pix, NULL, x, y, mipmap, 0, ima);

Modified: trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp	2012-08-18 03:24:41 UTC (rev 49973)
+++ trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp	2012-08-18 03:32:28 UTC (rev 49974)
@@ -201,11 +201,6 @@
 	return;
 #else
 	glBindTexture(GL_TEXTURE_2D, mTexture);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
 	
 	if (GPU_upload_dxt_texture(ibuf) == 0) {
 		InitGLTex(ibuf->rect, ibuf->x, ibuf->y, mipmap);