diff options
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve/opengl/shader')
8 files changed, 11 insertions, 209 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/UniformNames.java b/src/jogl/classes/jogamp/graph/curve/opengl/shader/UniformNames.java index df5ba35f2..f37025516 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/UniformNames.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/UniformNames.java @@ -5,7 +5,7 @@ public class UniformNames { public static final String gcu_ColorStatic = "gcu_ColorStatic"; public static final String gcu_Weight = "gcu_Weight"; - public static final String gcu_PMVMatrix02 = "gcu_PMVMatrix01"; // gcu_PMVMatrix[3]; // P, Mv, and Mvi + public static final String gcu_PMVMatrix02 = "gcu_PMVMatrix02"; // gcu_PMVMatrix[3]; // P, Mv, and Mvi public static final String gcu_FboTexUnit = "gcu_FboTexUnit"; public static final String gcu_FboTexSize = "gcu_FboTexSize"; } diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm-weight.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm-weight.fp deleted file mode 100644 index 6e60fc044..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm-weight.fp +++ /dev/null @@ -1,23 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 1-pass shader w/o weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -void main (void) -{ - -// #include curverenderer01-pass1-curve-lineAA.glsl -#include curverenderer01-pass1-curve-weight.glsl - -} diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm.fp deleted file mode 100644 index 18f06fff0..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-1pass_norm.fp +++ /dev/null @@ -1,23 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 1-pass shader w/o weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -void main (void) -{ - -// #include curverenderer01-pass1-curve-lineAA.glsl -#include curverenderer01-pass1-curve-simple.glsl - -} diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa-weight.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa-weight.fp deleted file mode 100644 index 0a4f7b331..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa-weight.fp +++ /dev/null @@ -1,35 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 2-pass shader w/ weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; - #define texture2D texture -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -void main (void) -{ - if( 0.0 < gcu_FboTexSize.z ) { - // Pass-2: Dump Texture - vec4 t = texture2D(gcu_FboTexUnit, gcv_FboTexCoord.st); - #if 0 - if( 0.0 == t.a ) { - discard; // discard freezes NV tegra2 compiler - } - #endif - - mgl_FragColor = t; - } else { - -#include curverenderer01-pass1-curve-weight.glsl - - } -} diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa.fp deleted file mode 100644 index c5cbb99b0..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_msaa.fp +++ /dev/null @@ -1,36 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 2-pass shader w/o weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; - #define texture2D texture -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -void main (void) -{ - if( 0.0 < gcu_FboTexSize.z ) { - // Pass-2: Dump Texture - vec4 t = texture2D(gcu_FboTexUnit, gcv_FboTexCoord.st); - #if 0 - if( 0.0 == t.a ) { - discard; // discard freezes NV tegra2 compiler - } - #endif - - mgl_FragColor = t; - } else { - -#include curverenderer01-pass1-curve-simple.glsl - - } -} - diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp deleted file mode 100644 index e3bcd20ae..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp +++ /dev/null @@ -1,44 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 2-pass shader w/ weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; - #define texture2D texture -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -#define GetSample(texUnit, texCoord, psize, cx, cy, offX, offY) texture2D(texUnit, texCoord + psize * vec2(cx+offX, cy+offY)) - -void main (void) -{ - if( 0.0 < gcu_FboTexSize.z ) { - -// Quality: allsamples > [flipquad,rgss, quincunx] > poles -#include curverenderer01-pass2-vbaa_allsamples_equal.glsl - -// #include curverenderer01-pass2-vbaa_flipquad3.glsl -// #include curverenderer01-pass2-vbaa_flipquad2.glsl -// #include curverenderer01-pass2-vbaa_flipquad.glsl -// #include curverenderer01-pass2-vbaa_rgss.glsl -// #include curverenderer01-pass2-vbaa_quincunx.glsl - -// #include curverenderer01-pass2-vbaa_poles_equalweight.glsl -// #include curverenderer01-pass2-vbaa_poles_bilin1.glsl -// #include curverenderer01-pass2-vbaa_poles_propweight1.glsl -// #include curverenderer01-pass2-vbaa_allsamples_prop01.glsl -// #include curverenderer01-pass2-vbaa_fxaa3.glsl - - } else { - -#include curverenderer01-pass1-curve-weight.glsl - - } -} diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp deleted file mode 100644 index 52c719e46..000000000 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp +++ /dev/null @@ -1,47 +0,0 @@ -//Copyright 2010 JogAmp Community. All rights reserved. - -// -// 2-pass shader w/o weight -// - -#if __VERSION__ >= 130 - #define varying in - out vec4 mgl_FragColor; - #define texture2D texture -#else - #define mgl_FragColor gl_FragColor -#endif - -#include uniforms.glsl -#include varyings.glsl - -#define GetSample(texUnit, texCoord, psize, cx, cy, offX, offY) texture2D(texUnit, texCoord + psize * vec2(cx+offX, cy+offY)) - -void main (void) -{ - if( 0.0 < gcu_FboTexSize.z ) { - -// Quality: allsamples > [flipquad,rgss, quincunx] > poles - - if( 0.0 >= gcu_FboTexSize.w ) { -#include curverenderer01-pass2-vbaa_flipquad3.glsl - } else { -#include curverenderer01-pass2-vbaa_allsamples_equal.glsl - } -// #include curverenderer01-pass2-vbaa_flipquad2.glsl -// #include curverenderer01-pass2-vbaa_flipquad.glsl -// #include curverenderer01-pass2-vbaa_rgss.glsl -// #include curverenderer01-pass2-vbaa_quincunx.glsl - -// #include curverenderer01-pass2-vbaa_poles_equalweight.glsl -// #include curverenderer01-pass2-vbaa_poles_bilin1.glsl -// #include curverenderer01-pass2-vbaa_poles_propweight1.glsl -// #include curverenderer01-pass2-vbaa_allsamples_prop01.glsl -// #include curverenderer01-pass2-vbaa_fxaa3.glsl - - } else { - -#include curverenderer01-pass1-curve-simple.glsl - - } -} diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-msaa.glsl b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-msaa.glsl new file mode 100644 index 000000000..1872af67f --- /dev/null +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-msaa.glsl @@ -0,0 +1,10 @@ + // Pass-2: Dump Texture + vec4 t = texture2D(gcu_FboTexUnit, gcv_FboTexCoord.st); + #if 0 + if( 0.0 == t.a ) { + discard; // discard freezes NV tegra2 compiler + } + #endif + + mgl_FragColor = t; + |