GLWindow: Added perf logging; FBO: adjusted texture format; Fixed: ColorTexture fix for ES2

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1750 232f8b59-042b-4e1e-8c03-345bb8c30851

2 files changed, 3 insertions, 2 deletions

diff --git a/src/classes/com/sun/opengl/impl/glsl/shader/FixedFuncColorTexture.fp b/src/classes/com/sun/opengl/impl/glsl/shader/FixedFuncColorTexture.fp
index cc4bd0c64..804de9f64 100644
--- a/src/classes/com/sun/opengl/impl/glsl/shader/FixedFuncColorTexture.fp
+++ b/src/classes/com/sun/opengl/impl/glsl/shader/FixedFuncColorTexture.fp
@@ -31,8 +31,9 @@ vec4 getTexColor(in sampler2D tex, in int idx) {
 void main (void)
 {
     vec4 texColor = getTexColor(mgl_ActiveTexture,mgl_ActiveTextureIdx);
-    if(length(texColor)>0.0) {
-       gl_FragColor = vec4(frontColor.rgb*texColor.rgb, frontColor.a * texColor.a) ; 
+
+    if(length(texColor.rgb)>0.0) {
+       gl_FragColor = vec4(frontColor.rgb*texColor.rgb, frontColor.a) ;
     } else {
        gl_FragColor = frontColor;
     }
diff --git a/src/classes/com/sun/opengl/impl/glsl/shader/bin/nvidia/FixedFuncColorTexture.bfp b/src/classes/com/sun/opengl/impl/glsl/shader/bin/nvidia/FixedFuncColorTexture.bfp
index 375ea6293..b2dd5bab6 100755
--- a/src/classes/com/sun/opengl/impl/glsl/shader/bin/nvidia/FixedFuncColorTexture.bfp
+++ b/src/classes/com/sun/opengl/impl/glsl/shader/bin/nvidia/FixedFuncColorTexture.bfp