[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55612] branches/ge_harmony/source/blender /gpu: Moving the sampler out of the Texture struct in gpu_shader_prepass_frag. glsl to be more in line with GLSL specifications.

[Daniel Stokes]

Revision: 55612
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55612
Author:   kupoman
Date:     2013-03-27 03:10:14 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Moving the sampler out of the Texture struct in gpu_shader_prepass_frag.glsl to be more in line with GLSL specifications.

Modified Paths:
--------------
    branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
    branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl

Modified: branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c	2013-03-27 02:06:36 UTC (rev 55611)
+++ branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c	2013-03-27 03:10:14 UTC (rev 55612)
@@ -1475,7 +1475,7 @@
 			if (!tex) continue;
 
 			if (mtex->mapto & MAP_NORM && tex->type == TEX_IMAGE) {
-				sprintf(name, "bgl_Textures[%d].data", slot);
+				sprintf(name, "bgl_Textures[%d]", slot);
 				bind = GPU_shader_get_uniform(shader, name);
 				gpu_tex = GPU_texture_from_blender(tex->ima, &tex->iuser, TRUE, time, 1);
 				GPU_shader_uniform_texture(shader, bind, gpu_tex);
@@ -1483,14 +1483,14 @@
 			else
 				continue;
 
-			sprintf(name, "bgl_Textures[%d].enabled", slot);
+			sprintf(name, "bgl_TextureInfo[%d].enabled", slot);
 			bind = GPU_shader_get_uniform(shader, name);
 			GPU_shader_uniform_ivector(shader, bind, 1, 1, &t);
 
 			slot++;
 		}
 		for (; slot < MAX_MTEX; slot++) {
-			sprintf(name, "bgl_Textures[%d].enabled", slot);
+			sprintf(name, "bgl_TextureInfo[%d].enabled", slot);
 			bind = GPU_shader_get_uniform(shader, name);
 			GPU_shader_uniform_ivector(shader, bind, 1, 1, &f);
 		}

Modified: branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl
===================================================================
--- branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl	2013-03-27 02:06:36 UTC (rev 55611)
+++ branches/ge_harmony/source/blender/gpu/shaders/gpu_shader_prepass_frag.glsl	2013-03-27 03:10:14 UTC (rev 55612)
@@ -1,6 +1,5 @@
 #define MAX_TEX 8
-struct Texture {
-	sampler2D data;
+struct TextureInfo {
 	bool enabled;
 };
 
@@ -18,9 +17,9 @@
 varying vec4 varuv[8];
 varying vec4 vartangent;
 
-
 uniform Material bgl_Material;
-uniform Texture bgl_Textures[MAX_TEX];
+uniform TextureInfo bgl_TextureInfo[MAX_TEX];
+uniform sampler2D bgl_Textures[MAX_TEX];
 
 
 void main()
@@ -29,8 +28,8 @@
 	vec3 normal = varnormal;
 	vec3 data, B;
 	for (; i < MAX_TEX; i++) {
-		if (bgl_Textures[i].enabled) {
-			mtex_normal(varuv[i].xyz, bgl_Textures[i].data, data);
+		if (bgl_TextureInfo[i].enabled) {
+			mtex_normal(varuv[i].xyz, bgl_Textures[i], data);
 			mtex_nspace_tangent(vartangent, normal, data, data);
 			mtex_blend_normal(1.0, normal, data, normal);
 		}