diff --git a/examples/06-bump/fs_bump.sc b/examples/06-bump/fs_bump.sc index 9350190b7..a27ed1b07 100644 --- a/examples/06-bump/fs_bump.sc +++ b/examples/06-bump/fs_bump.sc @@ -1,4 +1,4 @@ -$input v_wpos, v_view, v_normal, v_tangent, v_bitangent, v_texcoord0 +$input v_wpos, v_view, v_normal, v_tangent, v_bitangent, v_texcoord0 // in... /* * Copyright 2011-2013 Branimir Karadzic. All rights reserved. diff --git a/examples/runtime/shaders/dx11/fs_bump.bin b/examples/runtime/shaders/dx11/fs_bump.bin index f36c95ac9..31dade09f 100644 Binary files a/examples/runtime/shaders/dx11/fs_bump.bin and b/examples/runtime/shaders/dx11/fs_bump.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_bright.bin b/examples/runtime/shaders/dx11/fs_hdr_bright.bin index 24714cdad..a3df051a4 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_bright.bin and b/examples/runtime/shaders/dx11/fs_hdr_bright.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_lum.bin b/examples/runtime/shaders/dx11/fs_hdr_lum.bin index e39c32ea4..d9c9a405e 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_lum.bin and b/examples/runtime/shaders/dx11/fs_hdr_lum.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_lumavg.bin b/examples/runtime/shaders/dx11/fs_hdr_lumavg.bin index f1cce53b6..58f385cf2 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_lumavg.bin and b/examples/runtime/shaders/dx11/fs_hdr_lumavg.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_mesh.bin b/examples/runtime/shaders/dx11/fs_hdr_mesh.bin index 8a20e6735..862697ee4 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_mesh.bin and b/examples/runtime/shaders/dx11/fs_hdr_mesh.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_skybox.bin b/examples/runtime/shaders/dx11/fs_hdr_skybox.bin index e58410e60..8520ea96a 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_skybox.bin and b/examples/runtime/shaders/dx11/fs_hdr_skybox.bin differ diff --git a/examples/runtime/shaders/dx11/fs_hdr_tonemap.bin b/examples/runtime/shaders/dx11/fs_hdr_tonemap.bin index 2b96b70b7..b3ed79a58 100644 Binary files a/examples/runtime/shaders/dx11/fs_hdr_tonemap.bin and b/examples/runtime/shaders/dx11/fs_hdr_tonemap.bin differ diff --git a/examples/runtime/shaders/dx11/fs_mesh.bin b/examples/runtime/shaders/dx11/fs_mesh.bin index 2fd6d8b2b..8b5207001 100644 Binary files a/examples/runtime/shaders/dx11/fs_mesh.bin and b/examples/runtime/shaders/dx11/fs_mesh.bin differ diff --git a/examples/runtime/shaders/dx11/fs_raymarching.bin b/examples/runtime/shaders/dx11/fs_raymarching.bin index d9a96b216..5609a160d 100644 Binary files a/examples/runtime/shaders/dx11/fs_raymarching.bin and b/examples/runtime/shaders/dx11/fs_raymarching.bin differ diff --git a/examples/runtime/shaders/dx11/vs_bump.bin b/examples/runtime/shaders/dx11/vs_bump.bin index 508915ad6..98bd45982 100644 Binary files a/examples/runtime/shaders/dx11/vs_bump.bin and b/examples/runtime/shaders/dx11/vs_bump.bin differ diff --git a/examples/runtime/shaders/dx11/vs_callback.bin b/examples/runtime/shaders/dx11/vs_callback.bin index bfd4dec02..3444cf470 100644 Binary files a/examples/runtime/shaders/dx11/vs_callback.bin and b/examples/runtime/shaders/dx11/vs_callback.bin differ diff --git a/examples/runtime/shaders/dx11/vs_cubes.bin b/examples/runtime/shaders/dx11/vs_cubes.bin index e269d2db9..84ca4b95b 100644 Binary files a/examples/runtime/shaders/dx11/vs_cubes.bin and b/examples/runtime/shaders/dx11/vs_cubes.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_blur.bin b/examples/runtime/shaders/dx11/vs_hdr_blur.bin index 580cfca41..00c403ceb 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_blur.bin and b/examples/runtime/shaders/dx11/vs_hdr_blur.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_bright.bin b/examples/runtime/shaders/dx11/vs_hdr_bright.bin index fb2fbc493..cd4354ec8 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_bright.bin and b/examples/runtime/shaders/dx11/vs_hdr_bright.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_lum.bin b/examples/runtime/shaders/dx11/vs_hdr_lum.bin index fb2fbc493..cd4354ec8 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_lum.bin and b/examples/runtime/shaders/dx11/vs_hdr_lum.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_lumavg.bin b/examples/runtime/shaders/dx11/vs_hdr_lumavg.bin index fb2fbc493..cd4354ec8 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_lumavg.bin and b/examples/runtime/shaders/dx11/vs_hdr_lumavg.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_mesh.bin b/examples/runtime/shaders/dx11/vs_hdr_mesh.bin index 55702efe2..af210be23 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_mesh.bin and b/examples/runtime/shaders/dx11/vs_hdr_mesh.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_skybox.bin b/examples/runtime/shaders/dx11/vs_hdr_skybox.bin index fb2fbc493..cd4354ec8 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_skybox.bin and b/examples/runtime/shaders/dx11/vs_hdr_skybox.bin differ diff --git a/examples/runtime/shaders/dx11/vs_hdr_tonemap.bin b/examples/runtime/shaders/dx11/vs_hdr_tonemap.bin index a8fb726f2..b98c3089b 100644 Binary files a/examples/runtime/shaders/dx11/vs_hdr_tonemap.bin and b/examples/runtime/shaders/dx11/vs_hdr_tonemap.bin differ diff --git a/examples/runtime/shaders/dx11/vs_instancing.bin b/examples/runtime/shaders/dx11/vs_instancing.bin index 08417497b..94ec0387c 100644 Binary files a/examples/runtime/shaders/dx11/vs_instancing.bin and b/examples/runtime/shaders/dx11/vs_instancing.bin differ diff --git a/examples/runtime/shaders/dx11/vs_mesh.bin b/examples/runtime/shaders/dx11/vs_mesh.bin index 603137d55..b4f4f06b6 100644 Binary files a/examples/runtime/shaders/dx11/vs_mesh.bin and b/examples/runtime/shaders/dx11/vs_mesh.bin differ diff --git a/examples/runtime/shaders/dx11/vs_metaballs.bin b/examples/runtime/shaders/dx11/vs_metaballs.bin index a7bc4e210..fcf56c06f 100644 Binary files a/examples/runtime/shaders/dx11/vs_metaballs.bin and b/examples/runtime/shaders/dx11/vs_metaballs.bin differ diff --git a/examples/runtime/shaders/dx11/vs_raymarching.bin b/examples/runtime/shaders/dx11/vs_raymarching.bin index 45b791d99..dcf30c324 100644 Binary files a/examples/runtime/shaders/dx11/vs_raymarching.bin and b/examples/runtime/shaders/dx11/vs_raymarching.bin differ diff --git a/examples/runtime/shaders/dx11/vs_update.bin b/examples/runtime/shaders/dx11/vs_update.bin index b1143905a..16c7317f2 100644 Binary files a/examples/runtime/shaders/dx11/vs_update.bin and b/examples/runtime/shaders/dx11/vs_update.bin differ diff --git a/examples/runtime/shaders/dx9/vs_callback.bin b/examples/runtime/shaders/dx9/vs_callback.bin index e1f17d62e..52890547a 100644 Binary files a/examples/runtime/shaders/dx9/vs_callback.bin and b/examples/runtime/shaders/dx9/vs_callback.bin differ diff --git a/examples/runtime/shaders/dx9/vs_metaballs.bin b/examples/runtime/shaders/dx9/vs_metaballs.bin index 1869a6ec2..88700f1e7 100644 Binary files a/examples/runtime/shaders/dx9/vs_metaballs.bin and b/examples/runtime/shaders/dx9/vs_metaballs.bin differ diff --git a/examples/runtime/shaders/gles/vs_callback.bin b/examples/runtime/shaders/gles/vs_callback.bin index bde672e8a..9e1ab1c26 100644 Binary files a/examples/runtime/shaders/gles/vs_callback.bin and b/examples/runtime/shaders/gles/vs_callback.bin differ diff --git a/examples/runtime/shaders/gles/vs_metaballs.bin b/examples/runtime/shaders/gles/vs_metaballs.bin index 79e18eac1..32b26a6a8 100644 Binary files a/examples/runtime/shaders/gles/vs_metaballs.bin and b/examples/runtime/shaders/gles/vs_metaballs.bin differ diff --git a/examples/runtime/shaders/glsl/vs_callback.bin b/examples/runtime/shaders/glsl/vs_callback.bin index e74ba4b9c..d6c318d85 100644 Binary files a/examples/runtime/shaders/glsl/vs_callback.bin and b/examples/runtime/shaders/glsl/vs_callback.bin differ diff --git a/examples/runtime/shaders/glsl/vs_metaballs.bin b/examples/runtime/shaders/glsl/vs_metaballs.bin index d35ac4e21..d0b26b7d8 100644 Binary files a/examples/runtime/shaders/glsl/vs_metaballs.bin and b/examples/runtime/shaders/glsl/vs_metaballs.bin differ diff --git a/tools/bin/shaderc.exe b/tools/bin/shaderc.exe index e033cd7c8..774927ccd 100644 Binary files a/tools/bin/shaderc.exe and b/tools/bin/shaderc.exe differ diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 4a833586d..33328a166 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -1213,7 +1213,7 @@ uint32_t parseInOut(InOut& _inout, const char* _str, const char* _eol) _str = bx::strws(delim + 1); } } - while (delim < _eol && NULL != delim); + while (delim < _eol && _str < _eol && NULL != delim); std::sort(_inout.begin(), _inout.end() ); @@ -1533,11 +1533,15 @@ int main(int _argc, const char* _argv[]) if (0 == strncmp(str, "input", 5) ) { str += 5; + const char* comment = strstr(str, "//"); + eol = NULL != comment && comment < eol ? comment : eol; inputHash = parseInOut(shaderInputs, str, eol); } else if (0 == strncmp(str, "output", 6) ) { str += 6; + const char* comment = strstr(str, "//"); + eol = NULL != comment && comment < eol ? comment : eol; outputHash = parseInOut(shaderOutputs, str, eol); } }