[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42686] trunk/blender/source/blender: move GPU_code_generate_glsl_lib to GPU_extensions_init.

[Antony Riakiotakis]

Revision: 42686
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42686
Author:   psy-fi
Date:     2011-12-17 12:58:20 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
move GPU_code_generate_glsl_lib to GPU_extensions_init. This makes more sense 
as we cleanup the library string in GPU_extensions_exit. Thanks to Mitchel 
Stokes for reporting and proposing this

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c    2011-12-17 
12:29:51 UTC (rev 42685)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c    2011-12-17 
12:58:20 UTC (rev 42686)
@@ -112,6 +112,10 @@
        if (!GLEW_ARB_vertex_shader) GG.glslsupport = 0;
        if (!GLEW_ARB_fragment_shader) GG.glslsupport = 0;
 
+       if(GG.glslsupport){
+               GPU_code_generate_glsl_lib();
+       }
+
        glGetIntegerv(GL_RED_BITS, &r);
        glGetIntegerv(GL_GREEN_BITS, &g);
        glGetIntegerv(GL_BLUE_BITS, &b);

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c    
2011-12-17 12:29:51 UTC (rev 42685)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c    
2011-12-17 12:58:20 UTC (rev 42686)
@@ -176,7 +176,6 @@
                GPU_extensions_init();
                GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
                GPU_set_anisotropic(U.anisotropic_filter);
-               GPU_code_generate_glsl_lib();
        
                UI_init();
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs