[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56379] trunk/blender/source/blender/ blenfont: don't use GPU_extensions for BLF, its not initialized when using the blender-playanim and not really needed.

[Campbell Barton]

Revision: 56379
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56379
Author:   campbellbarton
Date:     2013-04-29 12:07:27 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
don't use GPU_extensions for BLF, its not initialized when using the blender-playanim and not really needed.
this reverts part of 55995

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/CMakeLists.txt
    trunk/blender/source/blender/blenfont/SConscript
    trunk/blender/source/blender/blenfont/intern/blf_glyph.c

Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt	2013-04-29 11:07:49 UTC (rev 56378)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt	2013-04-29 12:07:27 UTC (rev 56379)
@@ -31,7 +31,6 @@
 	../makesrna
 	../python
 	../imbuf
-	../gpu
 	../../../intern/guardedalloc
 	../../../intern/locale
 )

Modified: trunk/blender/source/blender/blenfont/SConscript
===================================================================
--- trunk/blender/source/blender/blenfont/SConscript	2013-04-29 11:07:49 UTC (rev 56378)
+++ trunk/blender/source/blender/blenfont/SConscript	2013-04-29 12:07:27 UTC (rev 56379)
@@ -33,7 +33,6 @@
 incs = '. intern  #/intern/guardedalloc #/intern/locale ../blenkernel ../blenlib ../blenloader'
 incs += ' ../makesdna ../makesrna ../python ../imbuf ../editors/include'
 incs += ' #/extern/glew/include'
-incs += ' ../gpu'
 incs += ' ' + env['BF_FREETYPE_INC']
 
 defs = ['GLEW_STATIC']

Modified: trunk/blender/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2013-04-29 11:07:49 UTC (rev 56378)
+++ trunk/blender/source/blender/blenfont/intern/blf_glyph.c	2013-04-29 12:07:27 UTC (rev 56379)
@@ -55,7 +55,6 @@
 #include "blf_internal_types.h"
 #include "blf_internal.h"
 
-#include "GPU_extensions.h"
 
 GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi)
 {
@@ -382,7 +381,7 @@
 		GlyphCacheBLF *gc = font->glyph_cache;
 
 		if (font->max_tex_size == -1)
-			font->max_tex_size = GPU_max_texture_size();
+			glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->max_tex_size);
 
 		if (gc->cur_tex == -1) {
 			blf_glyph_cache_texture(font, gc);