[Bf-blender-cvs] [079e0b5943f] blender2.8: OpenGL: don't set texture LoD bias via glTexEnvf

Mike Erwin noreply at git.blender.org
Thu Apr 27 20:35:26 CEST 2017


Commit: 079e0b5943f379caab2c92b3aabd033da5650e3f
Author: Mike Erwin
Date:   Thu Apr 27 14:24:32 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB079e0b5943f379caab2c92b3aabd033da5650e3f

OpenGL: don't set texture LoD bias via glTexEnvf

Not supported in core profile. We could do this in GLSL if it's really needed.

Part of T51164

===================================================================

M	source/blender/editors/interface/interface_icons.c

===================================================================

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 86fe517c975..88d92906040 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1024,9 +1024,6 @@ static void icon_draw_texture(
 	y1 = iy * icongltex.invh;
 	y2 = (iy + ih) * icongltex.invh;
 
-	/* sharper downscaling, has no effect when scale matches with a mip level */
-	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -0.5f);
-
 	glBindTexture(GL_TEXTURE_2D, icongltex.id);
 	VertexFormat *format = immVertexFormat();
 	unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
@@ -1054,8 +1051,6 @@ static void icon_draw_texture(
 
 	immUnbindProgram();
 
-	glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.0f);
-
 	glBindTexture(GL_TEXTURE_2D, 0);
 }




More information about the Bf-blender-cvs mailing list