diff options
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/fragment.glsl | 14 | ||||
| -rw-r--r-- | assets/quad_fragment.glsl | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/assets/fragment.glsl b/assets/fragment.glsl index 3e67b83..91d89a2 100644 --- a/assets/fragment.glsl +++ b/assets/fragment.glsl @@ -8,19 +8,13 @@ out vec4 oColor; uniform sampler2D materialTexture; //uniform sampler2DShadow prevDepth; -uniform sampler2DMS prevDepth; -//uniform sampler2D prevDepth; +//uniform sampler2DMS prevDepth; +uniform sampler2D prevDepth; void main() { //if (texture(prevDepth, vec3(fDepthTexCoord, gl_FragCoord.z + 0.000005)) == 1) - //if (gl_FragCoord.z + 0.000005 < texelFetch(prevDepth, ivec2(gl_FragCoord.xy), gl_SampleID).r) - if (gl_FragCoord.z + 0.000005 < texelFetch(prevDepth, ivec2(gl_FragCoord.xy), gl_SampleID).r) - oColor = vec4(fPos, 0.5); - //oColor = texelFetch(prevDepth, ivec2(gl_FragCoord.xy), gl_SampleID); - else + if (gl_FragCoord.z + 0.000005 >= texelFetch(prevDepth, ivec2(gl_FragCoord.xy), gl_SampleID).r) discard; - //if (texture(prevDepth, vec3(fDepthTexCoord, )) < 1) - // discard; - + oColor = vec4(fPos, 0.5); } diff --git a/assets/quad_fragment.glsl b/assets/quad_fragment.glsl index 7cf31d4..6fadc93 100644 --- a/assets/quad_fragment.glsl +++ b/assets/quad_fragment.glsl @@ -4,12 +4,12 @@ in vec2 fTexCoord; out vec4 oColor; -uniform sampler2DMS texture0; -//uniform sampler2D texture0; +//uniform sampler2DMS texture0; +uniform sampler2D texture0; void main() { - // oColor = texture(texture0, fTexCoord); + oColor = texture(texture0, fTexCoord); // oColor = texelFetch(texture0, ivec2(gl_FragCoord.xy), 0); - oColor = texelFetch(texture0, ivec2(gl_FragCoord.xy), gl_SampleID); + //oColor = texelFetch(texture0, ivec2(gl_FragCoord.xy), gl_SampleID); } |