From d2b4f9c627e6a9621797d7b9b8b3b83d3bfc2db5 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Sat, 26 Dec 2015 22:23:12 -0500 Subject: OpenGL: image drawing tweaks - no need to allocate client memory up front - delete unneeded GL calls - set default alpha test function on exit --- source/blender/editors/screen/glutil.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index cbb6b7685af..44ccf9a56bf 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -351,8 +351,6 @@ static int get_cached_work_texture(int *r_w, int *r_h) static int tex_h = 256; if (texid == -1) { - unsigned char *tbuf; - glGenTextures(1, (GLuint *)&texid); glBindTexture(GL_TEXTURE_2D, texid); @@ -360,9 +358,7 @@ static int get_cached_work_texture(int *r_w, int *r_h) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - tbuf = MEM_callocN(tex_w * tex_h * 4, "tbuf"); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_w, tex_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tbuf); - MEM_freeN(tbuf); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_w, tex_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); glBindTexture(GL_TEXTURE_2D, 0); } -- cgit v1.2.3