diff --git a/misc/glslc-test-basic.frag.glsl b/misc/glslc-test-basic.frag.glsl index 3bec68c73d..405e1f965b 100644 --- a/misc/glslc-test-basic.frag.glsl +++ b/misc/glslc-test-basic.frag.glsl @@ -8,5 +8,8 @@ layout(location = 0) uniform sampler2D tex; layout(location = 1) uniform vec4 color; void main(void) { - outColor = texture(tex, texCoord) * color; + // https://github.com/KhronosGroup/glslang/issues/2206 + float foo = 42; + foo = smoothstep(0, 1, foo); + outColor = texture(tex, texCoord) * color * foo; } diff --git a/resources/00-taisei.pkgdir/shader/meson.build b/resources/00-taisei.pkgdir/shader/meson.build index b4ad2c033b..145608a773 100644 --- a/resources/00-taisei.pkgdir/shader/meson.build +++ b/resources/00-taisei.pkgdir/shader/meson.build @@ -170,30 +170,29 @@ if validate_glsl != 'false' if test_result.returncode() == 0 glslc_args += '-Werror' - validate_glsl = true else glslc_args += '-std=430core' warning('glslc does not support GL_ARB_explicit_uniform_location, forcing shader version to 430core as a workaround.\n\n@0@'.format(test_result.stderr())) + endif - test_result = run_command(glslc_command, - glslc_args, - glslc_frag_args, - glslc_test_basic_file, - '-o', '-', - capture : false - ) + test_result = run_command(glslc_command, + glslc_args, + glslc_frag_args, + glslc_test_basic_file, + '-o', '-', + capture : false + ) - if test_result.returncode() == 0 - validate_glsl = true - else - warning(test_result.stderr()) + if test_result.returncode() == 0 + validate_glsl = true + else + warning(test_result.stderr()) - if validate_glsl == 'auto' - warning('glslc test failed, you probably have an incompatible version. GLSL validation will be disabled.') - validate_glsl = false - else - error('glslc test failed, you probably have an incompatible version.') - endif + if validate_glsl == 'auto' + warning('Basic glslc test failed, you probably have a broken/incompatible version. GLSL validation will be disabled.') + validate_glsl = false + else + error('Basic glslc test failed, you probably have a broken/incompatible version.') endif endif else