[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49739] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern: Switch to glsl gpu lights for OpenGL ES and OpenGL 3.0+

[Alexander Kuznetsov]

Revision: 49739
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49739
Author:   alexk
Date:     2012-08-09 17:07:01 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
Switch to glsl gpu lights for OpenGL ES and OpenGL 3.0+
P.S. 
They aren't implemented yet

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c	2012-08-09 17:03:33 UTC (rev 49738)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting.c	2012-08-09 17:07:01 UTC (rev 49739)
@@ -30,7 +30,9 @@
  */
 
 #include "gpu_lighting_internal.h"
+#include "GPU_extensions.h"
 
+
 #include "MEM_guardedalloc.h"
 
 
@@ -42,24 +44,26 @@
 void gpuInitializeLighting(void)
 {
 	GPU_LIGHTING = MEM_mallocN(sizeof(GPUlighting), "GPU_LIGHTING");
-
-		//GPU_LIGHTING->material_fv            = gpu_material_fv_glsl;
-		//GPU_LIGHTING->material_i             = gpu_material_i_glsl;
-		//GPU_LIGHTING->get_material_fv        = gpu_get_material_fv_glsl;
-		//GPU_LIGHTING->color_material         = gpu_color_material_glsl;
-		//GPU_LIGHTING->enable_color_material  = gpu_enable_color_material_glsl;
-		//GPU_LIGHTING->disable_color_material = gpu_disable_color_material_glsl;
-		//GPU_LIGHTING->light_f                = gpu_light_f_glsl;
-		//GPU_LIGHTING->light_fv               = gpu_light_fv_glsl;
-		//GPU_LIGHTING->enable_light           = gpu_enable_light_glsl;
-		//GPU_LIGHTING->disable_light          = gpu_disable_light_glsl;
-		//GPU_LIGHTING->is_light_enabled       = gpu_is_light_enabled_glsl;
-		//GPU_LIGHTING->light_model_i          = gpu_light_model_i_glsl;
-		//GPU_LIGHTING->light_model_fv         = gpu_light_model_fv_glsl;
-		//GPU_LIGHTING->enable_lighting        = gpu_enable_lighting_glsl;
-		//GPU_LIGHTING->disable_lighting       = gpu_disable_lighting_glsl;
-		//GPU_LIGHTING->is_lighting_enabled    = gpu_is_lighting_enabled_glsl;
-	// else {
+	if(!GPU_GLTYPE_FIXED_ENABLED)
+	{
+		GPU_LIGHTING->material_fv            = gpu_material_fv_glsl;
+		GPU_LIGHTING->material_i             = gpu_material_i_glsl;
+		GPU_LIGHTING->get_material_fv        = gpu_get_material_fv_glsl;
+		GPU_LIGHTING->color_material         = gpu_color_material_glsl;
+		GPU_LIGHTING->enable_color_material  = gpu_enable_color_material_glsl;
+		GPU_LIGHTING->disable_color_material = gpu_disable_color_material_glsl;
+		GPU_LIGHTING->light_f                = gpu_light_f_glsl;
+		GPU_LIGHTING->light_fv               = gpu_light_fv_glsl;
+		GPU_LIGHTING->enable_light           = gpu_enable_light_glsl;
+		GPU_LIGHTING->disable_light          = gpu_disable_light_glsl;
+		GPU_LIGHTING->is_light_enabled       = gpu_is_light_enabled_glsl;
+		GPU_LIGHTING->light_model_i          = gpu_light_model_i_glsl;
+		GPU_LIGHTING->light_model_fv         = gpu_light_model_fv_glsl;
+		GPU_LIGHTING->enable_lighting        = gpu_enable_lighting_glsl;
+		GPU_LIGHTING->disable_lighting       = gpu_disable_lighting_glsl;
+		GPU_LIGHTING->is_lighting_enabled    = gpu_is_lighting_enabled_glsl;
+	} else {
+#ifndef GLES
 		GPU_LIGHTING->material_fv            = gpu_material_fv_gl11;
 		GPU_LIGHTING->material_i             = gpu_material_i_gl11;
 		GPU_LIGHTING->get_material_fv        = gpu_get_material_fv_gl11;
@@ -76,7 +80,8 @@
 		GPU_LIGHTING->enable_lighting        = gpu_enable_lighting_gl11;
 		GPU_LIGHTING->disable_lighting       = gpu_disable_lighting_gl11;
 		GPU_LIGHTING->is_lighting_enabled    = gpu_is_lighting_enabled_gl11;
-	//}
+#endif
+	}
 }
 
 

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c	2012-08-09 17:03:33 UTC (rev 49738)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_lighting_gl11.c	2012-08-09 17:07:01 UTC (rev 49739)
@@ -28,11 +28,10 @@
 /** \file gpu_lighting.c
  *  \ingroup gpu
  */
-
+#ifndef GLES
 #include "gpu_lighting_internal.h"
 
 
-
 void gpu_material_fv_gl11(GLenum face, GLenum pname, const GLfloat *params)
 {
 	glMaterialfv(face, pname, params);
@@ -142,3 +141,5 @@
 {
 	return glIsEnabled(GL_LIGHTING);
 }
+
+#endif