diff --git a/README.md b/README.md index 00816809..09115745 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ Languages: * [Go language API bindings](https://github.com/james4k/go-bgfx) * [Java language API bindings](https://github.com/enleeten/twilight-bgfx) * [Haskell language API bindings](https://github.com/haskell-game/bgfx) + * [Python language API bindings](https://github.com/jnadro/pybgfx#pybgf) * [Rust language API bindings](https://github.com/rhoot/bgfx-rs) [Building](https://bkaradzic.github.io/bgfx/build.html) diff --git a/examples/01-cubes/makefile b/examples/01-cubes/makefile index 011773e0..e6278cb6 100644 --- a/examples/01-cubes/makefile +++ b/examples/01-cubes/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/02-metaballs/makefile b/examples/02-metaballs/makefile index 2d351e1d..e6278cb6 100644 --- a/examples/02-metaballs/makefile +++ b/examples/02-metaballs/makefile @@ -1,9 +1,18 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../scripts/shader-embeded.mk +BGFX_DIR=../.. +RUNTIME_DIR=$(BGFX_DIR)/examples/runtime +BUILD_DIR=../../.build + +include $(BGFX_DIR)/scripts/shader.mk rebuild: - @make -s --no-print-directory clean all + @make -s --no-print-directory TARGET=0 clean all + @make -s --no-print-directory TARGET=1 clean all + @make -s --no-print-directory TARGET=2 clean all + @make -s --no-print-directory TARGET=3 clean all + @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/03-raymarch/makefile b/examples/03-raymarch/makefile index 011773e0..e6278cb6 100644 --- a/examples/03-raymarch/makefile +++ b/examples/03-raymarch/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/04-mesh/makefile b/examples/04-mesh/makefile index 011773e0..e6278cb6 100644 --- a/examples/04-mesh/makefile +++ b/examples/04-mesh/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/05-instancing/makefile b/examples/05-instancing/makefile index 011773e0..e6278cb6 100644 --- a/examples/05-instancing/makefile +++ b/examples/05-instancing/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/06-bump/makefile b/examples/06-bump/makefile index 011773e0..e6278cb6 100644 --- a/examples/06-bump/makefile +++ b/examples/06-bump/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/07-callback/makefile b/examples/07-callback/makefile index 011773e0..e6278cb6 100644 --- a/examples/07-callback/makefile +++ b/examples/07-callback/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/08-update/makefile b/examples/08-update/makefile index 011773e0..e6278cb6 100644 --- a/examples/08-update/makefile +++ b/examples/08-update/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/09-hdr/makefile b/examples/09-hdr/makefile index 011773e0..e6278cb6 100644 --- a/examples/09-hdr/makefile +++ b/examples/09-hdr/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/12-lod/makefile b/examples/12-lod/makefile index 536534d3..e6278cb6 100644 --- a/examples/12-lod/makefile +++ b/examples/12-lod/makefile @@ -1,5 +1,5 @@ # -# Copyright 2013 Milos Tosic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/13-stencil/makefile b/examples/13-stencil/makefile index 420d008a..e6278cb6 100644 --- a/examples/13-stencil/makefile +++ b/examples/13-stencil/makefile @@ -1,5 +1,5 @@ # -# Copyright 2013-2014 Dario Manesku. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/14-shadowvolumes/makefile b/examples/14-shadowvolumes/makefile index f101bb91..e6278cb6 100644 --- a/examples/14-shadowvolumes/makefile +++ b/examples/14-shadowvolumes/makefile @@ -1,5 +1,5 @@ # -# Copyright 2013-2014 Dario Manesku. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -9,22 +9,10 @@ BUILD_DIR=../../.build include $(BGFX_DIR)/scripts/shader.mk -GEOMETRY_SRC= \ - bunny_patched \ - bunny_decimated \ - platform \ - cube - -GEOMETRY_BIN=$(addprefix $(RUNTIME_DIR)/meshes/, $(addsuffix .bin, $(basename $(GEOMETRY_SRC)))) - -geometry: $(GEOMETRY_BIN) - -$(RUNTIME_DIR)/meshes/%.bin : %.obj - $(SILENT) $(GEOMETRYC) -f $(<) -o $(@) --packnormal 1 - rebuild: @make -s --no-print-directory TARGET=0 clean all @make -s --no-print-directory TARGET=1 clean all @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/15-shadowmaps-simple/makefile b/examples/15-shadowmaps-simple/makefile index 420d008a..e6278cb6 100644 --- a/examples/15-shadowmaps-simple/makefile +++ b/examples/15-shadowmaps-simple/makefile @@ -1,5 +1,5 @@ # -# Copyright 2013-2014 Dario Manesku. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/16-shadowmaps/fs_shadowmaps_color_lighting_main.sh b/examples/16-shadowmaps/fs_shadowmaps_color_lighting_main.sh index acadba37..1b2b6be3 100644 --- a/examples/16-shadowmaps/fs_shadowmaps_color_lighting_main.sh +++ b/examples/16-shadowmaps/fs_shadowmaps_color_lighting_main.sh @@ -182,9 +182,9 @@ Shader shader = evalShader(lc.x, lc.y); //Fog. - const vec3 fogColor = vec3_splat(0.0); - const float fogDensity = 0.0035; - const float LOG2 = 1.442695; + vec3 fogColor = vec3_splat(0.0); + float fogDensity = 0.0035; + float LOG2 = 1.442695; float z = length(v); float fogFactor = clamp(1.0/exp2(fogDensity*fogDensity*z*z*LOG2), 0.0, 1.0); diff --git a/examples/16-shadowmaps/makefile b/examples/16-shadowmaps/makefile index 547cea69..e6278cb6 100644 --- a/examples/16-shadowmaps/makefile +++ b/examples/16-shadowmaps/makefile @@ -1,5 +1,5 @@ # -# Copyright 2013-2014 Dario Manesku. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -9,20 +9,10 @@ BUILD_DIR=../../.build include $(BGFX_DIR)/scripts/shader.mk -GEOMETRY_SRC= \ - tree \ - hollowcube - -GEOMETRY_BIN=$(addprefix $(RUNTIME_DIR)/meshes/, $(addsuffix .bin, $(basename $(GEOMETRY_SRC)))) - -geometry: $(GEOMETRY_BIN) - -$(RUNTIME_DIR)/meshes/%.bin : %.obj - $(SILENT) $(GEOMETRYC) -f $(<) -o $(@) --packnormal 1 - rebuild: @make -s --no-print-directory TARGET=0 clean all @make -s --no-print-directory TARGET=1 clean all @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/17-drawstress/makefile b/examples/17-drawstress/makefile index 2d351e1d..e6278cb6 100644 --- a/examples/17-drawstress/makefile +++ b/examples/17-drawstress/makefile @@ -1,9 +1,18 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../scripts/shader-embeded.mk +BGFX_DIR=../.. +RUNTIME_DIR=$(BGFX_DIR)/examples/runtime +BUILD_DIR=../../.build + +include $(BGFX_DIR)/scripts/shader.mk rebuild: - @make -s --no-print-directory clean all + @make -s --no-print-directory TARGET=0 clean all + @make -s --no-print-directory TARGET=1 clean all + @make -s --no-print-directory TARGET=2 clean all + @make -s --no-print-directory TARGET=3 clean all + @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/18-ibl/makefile b/examples/18-ibl/makefile index 65275428..e6278cb6 100644 --- a/examples/18-ibl/makefile +++ b/examples/18-ibl/makefile @@ -1,5 +1,5 @@ # -# Copyright 2014 Dario Manesku. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/18-ibl/screenshot.png b/examples/18-ibl/screenshot.png index ec0d2626..9cb3c375 100644 Binary files a/examples/18-ibl/screenshot.png and b/examples/18-ibl/screenshot.png differ diff --git a/examples/19-oit/makefile b/examples/19-oit/makefile index 011773e0..e6278cb6 100644 --- a/examples/19-oit/makefile +++ b/examples/19-oit/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/23-vectordisplay/makefile b/examples/23-vectordisplay/makefile index 011773e0..e6278cb6 100644 --- a/examples/23-vectordisplay/makefile +++ b/examples/23-vectordisplay/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/24-nbody/makefile b/examples/24-nbody/makefile index 011773e0..e6278cb6 100644 --- a/examples/24-nbody/makefile +++ b/examples/24-nbody/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/27-terrain/makefile b/examples/27-terrain/makefile index 011773e0..e6278cb6 100644 --- a/examples/27-terrain/makefile +++ b/examples/27-terrain/makefile @@ -1,5 +1,5 @@ # -# Copyright 2011-2015 Branimir Karadzic. All rights reserved. +# Copyright 2011-2016 Branimir Karadzic. All rights reserved. # License: http://www.opensource.org/licenses/BSD-2-Clause # @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/28-wireframe/fs_wf_mesh.sc b/examples/28-wireframe/fs_wf_mesh.sc index 7363d2d9..4a68b147 100644 --- a/examples/28-wireframe/fs_wf_mesh.sc +++ b/examples/28-wireframe/fs_wf_mesh.sc @@ -66,7 +66,7 @@ void main() float thickness = u_wfThickness; vec3 fw = abs(dFdx(v_bc)) + abs(dFdy(v_bc)); - vec3 val = smoothstep(vec3_splat(0.0), vec3_splat(fw*thickness), v_bc); + vec3 val = smoothstep(vec3_splat(0.0), fw*thickness, v_bc); float edge = min(min(val.x, val.y), val.z); // Gets to 0.0 when close to edges. vec3 edgeCol = mix(col, wfColor, wfOpacity); diff --git a/examples/28-wireframe/fs_wf_wireframe.sc b/examples/28-wireframe/fs_wf_wireframe.sc index a6d4e505..e2ff1420 100644 --- a/examples/28-wireframe/fs_wf_wireframe.sc +++ b/examples/28-wireframe/fs_wf_wireframe.sc @@ -17,7 +17,7 @@ void main() if (gl_FrontFacing) { opacity *= 0.5; } vec3 fw = abs(dFdx(v_bc)) + abs(dFdy(v_bc)); - vec3 val = smoothstep(vec3_splat(0.0), vec3_splat(fw*thickness), v_bc); + vec3 val = smoothstep(vec3_splat(0.0), fw*thickness, v_bc); float edge = min(min(val.x, val.y), val.z); // Gets to 0.0 around the edges. vec4 rgba = vec4(color, (1.0-edge)*opacity); diff --git a/examples/28-wireframe/makefile b/examples/28-wireframe/makefile index 4f81fb5b..e6278cb6 100644 --- a/examples/28-wireframe/makefile +++ b/examples/28-wireframe/makefile @@ -15,3 +15,4 @@ rebuild: @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all + @make -s --no-print-directory TARGET=5 clean all diff --git a/examples/28-wireframe/screenshot.png b/examples/28-wireframe/screenshot.png index 303bbfc1..65957306 100644 Binary files a/examples/28-wireframe/screenshot.png and b/examples/28-wireframe/screenshot.png differ diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 2226598d..07193b83 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -220,7 +220,7 @@ namespace entry # elif BX_PLATFORM_WINDOWS return wmi.info.win.window; # elif BX_PLATFORM_STEAMLINK - return wmi.info.vivante.window; + return wmi.info.vivante.window; # endif // BX_PLATFORM_ } @@ -308,6 +308,7 @@ namespace entry initTranslateKey(SDL_SCANCODE_PRINTSCREEN, Key::Print); initTranslateKey(SDL_SCANCODE_KP_PLUS, Key::Plus); initTranslateKey(SDL_SCANCODE_KP_MINUS, Key::Minus); + initTranslateKey(SDL_SCANCODE_GRAVE, Key::Tilde); initTranslateKey(SDL_SCANCODE_F1, Key::F1); initTranslateKey(SDL_SCANCODE_F2, Key::F2); initTranslateKey(SDL_SCANCODE_F3, Key::F3); diff --git a/examples/common/imgui/fs_imgui_image_swizz.bin.h b/examples/common/imgui/fs_imgui_image_swizz.bin.h index 593de84d..11044efd 100644 --- a/examples/common/imgui/fs_imgui_image_swizz.bin.h +++ b/examples/common/imgui/fs_imgui_image_swizz.bin.h @@ -1,10 +1,10 @@ -static const uint8_t fs_imgui_image_swizz_glsl[425] = +static const uint8_t fs_imgui_image_swizz_glsl[565] = { 0x46, 0x53, 0x48, 0x04, 0x6f, 0x1e, 0x3e, 0x3c, 0x03, 0x00, 0x11, 0x75, 0x5f, 0x69, 0x6d, 0x61, // FSH.o.><...u_ima 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x02, 0x01, 0x00, 0x00, // geLodEnabled.... 0x01, 0x00, 0x09, 0x75, 0x5f, 0x73, 0x77, 0x69, 0x7a, 0x7a, 0x6c, 0x65, 0x02, 0x01, 0x00, 0x00, // ...u_swizzle.... 0x01, 0x00, 0x0a, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x01, 0x00, // ...s_texColor... - 0x00, 0x01, 0x00, 0x61, 0x01, 0x00, 0x00, 0x76, 0x61, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x68, // ...a...varying h + 0x00, 0x01, 0x00, 0xed, 0x01, 0x00, 0x00, 0x76, 0x61, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x68, // .......varying h 0x69, 0x67, 0x68, 0x70, 0x20, 0x76, 0x65, 0x63, 0x32, 0x20, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x63, // ighp vec2 v_texc 0x6f, 0x6f, 0x72, 0x64, 0x30, 0x3b, 0x0a, 0x75, 0x6e, 0x69, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x68, // oord0;.uniform h 0x69, 0x67, 0x68, 0x70, 0x20, 0x76, 0x65, 0x63, 0x34, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, // ighp vec4 u_imag @@ -13,20 +13,29 @@ static const uint8_t fs_imgui_image_swizz_glsl[425] = 0x75, 0x5f, 0x73, 0x77, 0x69, 0x7a, 0x7a, 0x6c, 0x65, 0x3b, 0x0a, 0x75, 0x6e, 0x69, 0x66, 0x6f, // u_swizzle;.unifo 0x72, 0x6d, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x32, 0x44, 0x20, 0x73, 0x5f, 0x74, // rm sampler2D s_t 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x76, 0x6f, 0x69, 0x64, 0x20, 0x6d, 0x61, // exColor;.void ma - 0x69, 0x6e, 0x20, 0x28, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x77, 0x70, 0x20, 0x76, // in ().{. lowp v - 0x65, 0x63, 0x34, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x20, 0x20, // ec4 tmpvar_1;. - 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x2e, 0x78, 0x79, 0x7a, 0x20, 0x3d, 0x20, 0x76, // tmpvar_1.xyz = v - 0x65, 0x63, 0x33, 0x28, 0x64, 0x6f, 0x74, 0x20, 0x28, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, // ec3(dot (texture - 0x32, 0x44, 0x4c, 0x6f, 0x64, 0x20, 0x20, 0x20, 0x20, 0x28, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, // 2DLod (s_texC - 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x76, 0x5f, 0x74, 0x65, 0x78, 0x63, 0x6f, 0x6f, 0x72, 0x64, // olor, v_texcoord - 0x30, 0x2c, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, // 0, u_imageLodEna - 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x78, 0x29, 0x2c, 0x20, 0x75, 0x5f, 0x73, 0x77, 0x69, 0x7a, 0x7a, // bled.x), u_swizz - 0x6c, 0x65, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, // le));. tmpvar_1 - 0x2e, 0x77, 0x20, 0x3d, 0x20, 0x28, 0x30, 0x2e, 0x32, 0x20, 0x2b, 0x20, 0x28, 0x30, 0x2e, 0x38, // .w = (0.2 + (0.8 - 0x20, 0x2a, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, // * u_imageLodEna - 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x79, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x67, 0x6c, 0x5f, 0x46, // bled.y));. gl_F - 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, // ragColor = tmpva - 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // r_1;.}... + 0x69, 0x6e, 0x20, 0x28, 0x29, 0x0a, 0x7b, 0x0a, 0x20, 0x20, 0x6c, 0x6f, 0x77, 0x70, 0x20, 0x66, // in ().{. lowp f + 0x6c, 0x6f, 0x61, 0x74, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x20, // loat tmpvar_1;. + 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x20, 0x3d, 0x20, 0x64, 0x6f, 0x74, 0x20, // tmpvar_1 = dot + 0x28, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x32, 0x44, 0x4c, 0x6f, 0x64, 0x20, 0x20, 0x20, // (texture2DLod + 0x20, 0x28, 0x73, 0x5f, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x76, 0x5f, // (s_texColor, v_ + 0x74, 0x65, 0x78, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x30, 0x2c, 0x20, 0x75, 0x5f, 0x69, 0x6d, 0x61, // texcoord0, u_ima + 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x78, 0x29, 0x2c, // geLodEnabled.x), + 0x20, 0x75, 0x5f, 0x73, 0x77, 0x69, 0x7a, 0x7a, 0x6c, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x6c, // u_swizzle);. l + 0x6f, 0x77, 0x70, 0x20, 0x76, 0x65, 0x63, 0x33, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, // owp vec3 tmpvar_ + 0x32, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x2e, 0x78, 0x20, // 2;. tmpvar_2.x + 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, // = tmpvar_1;. tm + 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x2e, 0x79, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, // pvar_2.y = tmpva + 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x2e, // r_1;. tmpvar_2. + 0x7a, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x3b, 0x0a, 0x20, 0x20, // z = tmpvar_1;. + 0x6d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x70, 0x20, 0x76, 0x65, 0x63, 0x34, 0x20, 0x74, 0x6d, 0x70, // mediump vec4 tmp + 0x76, 0x61, 0x72, 0x5f, 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, // var_3;. tmpvar_ + 0x33, 0x2e, 0x78, 0x79, 0x7a, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, // 3.xyz = tmpvar_2 + 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x2e, 0x77, 0x20, 0x3d, // ;. tmpvar_3.w = + 0x20, 0x28, 0x30, 0x2e, 0x32, 0x20, 0x2b, 0x20, 0x28, 0x30, 0x2e, 0x38, 0x20, 0x2a, 0x20, 0x75, // (0.2 + (0.8 * u + 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, // _imageLodEnabled + 0x2e, 0x79, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x67, 0x6c, 0x5f, 0x46, 0x72, 0x61, 0x67, 0x43, // .y));. gl_FragC + 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x3b, // olor = tmpvar_3; + 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // .}... }; static const uint8_t fs_imgui_image_swizz_dx9[462] = { @@ -94,9 +103,9 @@ static const uint8_t fs_imgui_image_swizz_dx11[493] = 0x3e, 0x36, 0x00, 0x00, 0x05, 0xf2, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x10, // >6.... ......... 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x20, 0x00, // .....>..... . }; -static const uint8_t fs_imgui_image_swizz_mtl[879] = +static const uint8_t fs_imgui_image_swizz_mtl[1005] = { - 0x46, 0x53, 0x48, 0x04, 0x6f, 0x1e, 0x3e, 0x3c, 0x00, 0x00, 0x60, 0x03, 0x00, 0x00, 0x75, 0x73, // FSH.o.><..`...us + 0x46, 0x53, 0x48, 0x04, 0x6f, 0x1e, 0x3e, 0x3c, 0x00, 0x00, 0xde, 0x03, 0x00, 0x00, 0x75, 0x73, // FSH.o.><......us 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x6d, 0x65, // ing namespace me 0x74, 0x61, 0x6c, 0x3b, 0x0a, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x20, 0x78, 0x6c, 0x61, 0x74, // tal;.struct xlat 0x4d, 0x74, 0x6c, 0x53, 0x68, 0x61, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x7b, // MtlShaderInput { @@ -135,20 +144,28 @@ static const uint8_t fs_imgui_image_swizz_mtl[879] = 0x5f, 0x74, 0x65, 0x78, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x30, 0x29, 0x2c, 0x20, 0x6c, 0x65, 0x76, // _texcoord0), lev 0x65, 0x6c, 0x28, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x75, 0x2e, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, // el(_mtl_u.u_imag 0x65, 0x4c, 0x6f, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x78, 0x29, 0x29, 0x29, // eLodEnabled.x))) + 0x3b, 0x0a, 0x20, 0x20, 0x68, 0x61, 0x6c, 0x66, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, // ;. half tmpvar_ + 0x32, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x20, 0x3d, 0x20, // 2;. tmpvar_2 = + 0x28, 0x28, 0x68, 0x61, 0x6c, 0x66, 0x29, 0x64, 0x6f, 0x74, 0x20, 0x28, 0x28, 0x66, 0x6c, 0x6f, // ((half)dot ((flo + 0x61, 0x74, 0x34, 0x29, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x31, 0x2c, 0x20, 0x5f, 0x6d, // at4)tmpvar_1, _m + 0x74, 0x6c, 0x5f, 0x75, 0x2e, 0x75, 0x5f, 0x73, 0x77, 0x69, 0x7a, 0x7a, 0x6c, 0x65, 0x29, 0x29, // tl_u.u_swizzle)) 0x3b, 0x0a, 0x20, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, // ;. float tmpvar - 0x5f, 0x32, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x20, 0x3d, // _2;. tmpvar_2 = + 0x5f, 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x20, 0x3d, // _3;. tmpvar_3 = 0x20, 0x28, 0x30, 0x2e, 0x32, 0x20, 0x2b, 0x20, 0x28, 0x30, 0x2e, 0x38, 0x20, 0x2a, 0x20, 0x5f, // (0.2 + (0.8 * _ 0x6d, 0x74, 0x6c, 0x5f, 0x75, 0x2e, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4c, 0x6f, 0x64, // mtl_u.u_imageLod 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2e, 0x79, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x68, // Enabled.y));. h - 0x61, 0x6c, 0x66, 0x34, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x3b, 0x0a, 0x20, // alf4 tmpvar_3;. - 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x2e, 0x78, 0x79, 0x7a, 0x20, 0x3d, 0x20, // tmpvar_3.xyz = - 0x68, 0x61, 0x6c, 0x66, 0x33, 0x28, 0x28, 0x28, 0x68, 0x61, 0x6c, 0x66, 0x29, 0x64, 0x6f, 0x74, // half3(((half)dot - 0x20, 0x28, 0x28, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x34, 0x29, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, // ((float4)tmpvar - 0x5f, 0x31, 0x2c, 0x20, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x75, 0x2e, 0x75, 0x5f, 0x73, 0x77, 0x69, // _1, _mtl_u.u_swi - 0x7a, 0x7a, 0x6c, 0x65, 0x29, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, // zzle)));. tmpva - 0x72, 0x5f, 0x33, 0x2e, 0x77, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6c, 0x66, 0x28, 0x74, 0x6d, 0x70, // r_3.w = half(tmp - 0x76, 0x61, 0x72, 0x5f, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x6f, // var_2);. _mtl_o - 0x2e, 0x67, 0x6c, 0x5f, 0x46, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, // .gl_FragColor = - 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, // tmpvar_3;. retu - 0x72, 0x6e, 0x20, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x6f, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // rn _mtl_o;.}... + 0x61, 0x6c, 0x66, 0x33, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x3b, 0x0a, 0x20, // alf3 tmpvar_4;. + 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x2e, 0x78, 0x20, 0x3d, 0x20, 0x74, 0x6d, // tmpvar_4.x = tm + 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, // pvar_2;. tmpvar + 0x5f, 0x34, 0x2e, 0x79, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x3b, // _4.y = tmpvar_2; + 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x34, 0x2e, 0x7a, 0x20, 0x3d, 0x20, // . tmpvar_4.z = + 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x32, 0x3b, 0x0a, 0x20, 0x20, 0x68, 0x61, 0x6c, 0x66, // tmpvar_2;. half + 0x34, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, 0x35, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, // 4 tmpvar_5;. tm + 0x70, 0x76, 0x61, 0x72, 0x5f, 0x35, 0x2e, 0x78, 0x79, 0x7a, 0x20, 0x3d, 0x20, 0x74, 0x6d, 0x70, // pvar_5.xyz = tmp + 0x76, 0x61, 0x72, 0x5f, 0x34, 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x6d, 0x70, 0x76, 0x61, 0x72, 0x5f, // var_4;. tmpvar_ + 0x35, 0x2e, 0x77, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x6c, 0x66, 0x28, 0x74, 0x6d, 0x70, 0x76, 0x61, // 5.w = half(tmpva + 0x72, 0x5f, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x6f, 0x2e, 0x67, // r_3);. _mtl_o.g + 0x6c, 0x5f, 0x46, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6d, // l_FragColor = tm + 0x70, 0x76, 0x61, 0x72, 0x5f, 0x35, 0x3b, 0x0a, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, // pvar_5;. return + 0x20, 0x5f, 0x6d, 0x74, 0x6c, 0x5f, 0x6f, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x00, // _mtl_o;.}... }; diff --git a/examples/makefile b/examples/makefile index b49427c1..6c929fd9 100644 --- a/examples/makefile +++ b/examples/makefile @@ -34,25 +34,3 @@ rebuild: @make -s --no-print-directory rebuild -C common/font @make -s --no-print-directory rebuild -C common/imgui @make -s --no-print-directory rebuild -C common/nanovg - -metal: - @make -s --no-print-directory TARGET=5 -C 01-cubes - @make -s --no-print-directory TARGET=5 -C 03-raymarch - @make -s --no-print-directory TARGET=5 -C 04-mesh - @make -s --no-print-directory TARGET=5 -C 05-instancing - @make -s --no-print-directory TARGET=5 -C 06-bump - @make -s --no-print-directory TARGET=5 -C 07-callback - @make -s --no-print-directory TARGET=5 -C 08-update - @make -s --no-print-directory TARGET=5 -C 09-hdr - @make -s --no-print-directory TARGET=5 -C 12-lod - @make -s --no-print-directory TARGET=5 -C 13-stencil - @make -s --no-print-directory TARGET=5 -C 14-shadowvolumes - @make -s --no-print-directory TARGET=5 -C 15-shadowmaps-simple - @make -s --no-print-directory TARGET=5 -C 16-shadowmaps - @make -s --no-print-directory TARGET=5 -C 18-ibl - @make -s --no-print-directory TARGET=5 -C 19-oit - @make -s --no-print-directory TARGET=5 -C 21-deferred - @make -s --no-print-directory TARGET=5 -C 23-vectordisplay - @make -s --no-print-directory TARGET=5 -C 24-nbody - @make -s --no-print-directory TARGET=5 -C 27-terrain - @make -s --no-print-directory TARGET=5 -C 28-wireframe diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm.bin index e599c4ec..b27f3fd3 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_csm.bin index c2ac4161..03a3f89b 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear.bin index acb5c012..f85d0ec5 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_csm.bin index 3430e96d..39d115c4 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_omni.bin index 6c4859be..13ad9335 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_omni.bin index 95467349..d688775b 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_esm_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard.bin index d1612f8c..00300aa3 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_csm.bin index f6b2ac65..3fa09702 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear.bin index 52ac4285..12eaab3e 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_csm.bin index 221a4278..98f5ff14 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_omni.bin index 03b37762..07e12b43 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_omni.bin index 11f1c23b..cde6f19f 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_hard_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf.bin index 19d9bba4..2faada8a 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_csm.bin index 9581dddc..76b37271 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear.bin index 8746b286..cf8a001c 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_csm.bin index 9957e3b8..67c95d91 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_omni.bin index 3c72697a..748714f9 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_omni.bin index 834b235e..26fac391 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_pcf_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm.bin index 0ae83c41..27d52822 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_csm.bin index 87536cda..e2184d5b 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear.bin index 5129fdb6..c06948c1 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_csm.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_csm.bin index 08a5970d..91716e56 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_csm.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_omni.bin index 39d3bff0..338bd6fc 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_omni.bin b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_omni.bin index 0991b668..4ecfdbb9 100644 Binary files a/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_omni.bin and b/examples/runtime/shaders/dx11/fs_shadowmaps_color_lighting_vsm_omni.bin differ diff --git a/examples/runtime/shaders/dx11/fs_wf_mesh.bin b/examples/runtime/shaders/dx11/fs_wf_mesh.bin index a769f051..76647c0b 100644 Binary files a/examples/runtime/shaders/dx11/fs_wf_mesh.bin and b/examples/runtime/shaders/dx11/fs_wf_mesh.bin differ diff --git a/examples/runtime/shaders/dx11/fs_wf_wireframe.bin b/examples/runtime/shaders/dx11/fs_wf_wireframe.bin index 7b84b95f..3706b830 100644 Binary files a/examples/runtime/shaders/dx11/fs_wf_wireframe.bin and b/examples/runtime/shaders/dx11/fs_wf_wireframe.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm.bin index 99f5564c..bd5c93be 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_csm.bin index 420080db..046ad528 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear.bin index 2b80ccad..ae7c9227 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_csm.bin index 3bbfea99..a47bbbbb 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_omni.bin index c9d81f6f..4c1eb4ff 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_omni.bin index 308f93ef..e1964e28 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_esm_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard.bin index 3de4dcbc..ac0c477d 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_csm.bin index c53e8814..42ffa588 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear.bin index d29c6e8c..c57f980b 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_csm.bin index ca069354..3035d4d8 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_omni.bin index c316724a..8169fc8a 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_omni.bin index bef6549d..c9b5cd1b 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_hard_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf.bin index 55bce42f..cccab4c4 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_csm.bin index 7427157c..7b2afedb 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear.bin index a8c173e3..100b6afa 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_csm.bin index 98445810..ff07f745 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_omni.bin index e96824aa..de0f7436 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_omni.bin index bf00e852..a58ecb13 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_pcf_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm.bin index ac96c99d..e5654bea 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_csm.bin index 0e69a395..fabcb490 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear.bin index a1ce662b..d01917f3 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_csm.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_csm.bin index 80befb85..d283cc99 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_csm.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_csm.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_omni.bin index f0bdfd66..14941129 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_linear_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_omni.bin b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_omni.bin index 856c659f..9d5f2429 100644 Binary files a/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_omni.bin and b/examples/runtime/shaders/dx9/fs_shadowmaps_color_lighting_vsm_omni.bin differ diff --git a/examples/runtime/shaders/dx9/fs_wf_mesh.bin b/examples/runtime/shaders/dx9/fs_wf_mesh.bin index fb7f05df..06e389eb 100644 Binary files a/examples/runtime/shaders/dx9/fs_wf_mesh.bin and b/examples/runtime/shaders/dx9/fs_wf_mesh.bin differ diff --git a/examples/runtime/shaders/dx9/fs_wf_wireframe.bin b/examples/runtime/shaders/dx9/fs_wf_wireframe.bin index 2a06070c..6d992770 100644 Binary files a/examples/runtime/shaders/dx9/fs_wf_wireframe.bin and b/examples/runtime/shaders/dx9/fs_wf_wireframe.bin differ diff --git a/examples/runtime/shaders/gles/cs_indirect.bin b/examples/runtime/shaders/gles/cs_indirect.bin index 72c5eaf6..1faf1aeb 100644 Binary files a/examples/runtime/shaders/gles/cs_indirect.bin and b/examples/runtime/shaders/gles/cs_indirect.bin differ diff --git a/examples/runtime/shaders/gles/cs_init_instances.bin b/examples/runtime/shaders/gles/cs_init_instances.bin index 048a96ab..d74d461c 100644 Binary files a/examples/runtime/shaders/gles/cs_init_instances.bin and b/examples/runtime/shaders/gles/cs_init_instances.bin differ diff --git a/examples/runtime/shaders/gles/cs_update_instances.bin b/examples/runtime/shaders/gles/cs_update_instances.bin index 1059fa84..ddd207cc 100644 Binary files a/examples/runtime/shaders/gles/cs_update_instances.bin and b/examples/runtime/shaders/gles/cs_update_instances.bin differ diff --git a/examples/runtime/shaders/gles/fs_oit_wb_separate.bin b/examples/runtime/shaders/gles/fs_oit_wb_separate.bin index 51ae8f2d..3b51e727 100644 Binary files a/examples/runtime/shaders/gles/fs_oit_wb_separate.bin and b/examples/runtime/shaders/gles/fs_oit_wb_separate.bin differ diff --git a/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin b/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin index d0be0945..456040c6 100644 Binary files a/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin and b/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_linear_omni.bin differ diff --git a/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin b/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin index 44a131f6..fc57ca84 100644 Binary files a/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin and b/examples/runtime/shaders/gles/fs_shadowmaps_color_lighting_pcf_omni.bin differ diff --git a/examples/runtime/shaders/gles/fs_shadowvolume_svbackblank.bin b/examples/runtime/shaders/gles/fs_shadowvolume_svbackblank.bin index 2222aa66..c2fb7eac 100644 Binary files a/examples/runtime/shaders/gles/fs_shadowvolume_svbackblank.bin and b/examples/runtime/shaders/gles/fs_shadowvolume_svbackblank.bin differ diff --git a/examples/runtime/shaders/gles/fs_shadowvolume_svfrontblank.bin b/examples/runtime/shaders/gles/fs_shadowvolume_svfrontblank.bin index cbe48745..4b7b683d 100644 Binary files a/examples/runtime/shaders/gles/fs_shadowvolume_svfrontblank.bin and b/examples/runtime/shaders/gles/fs_shadowvolume_svfrontblank.bin differ diff --git a/examples/runtime/shaders/gles/fs_sms_shadow.bin b/examples/runtime/shaders/gles/fs_sms_shadow.bin index 98147ab0..3262874e 100644 Binary files a/examples/runtime/shaders/gles/fs_sms_shadow.bin and b/examples/runtime/shaders/gles/fs_sms_shadow.bin differ diff --git a/examples/runtime/shaders/gles/fs_stencil_color_lighting.bin b/examples/runtime/shaders/gles/fs_stencil_color_lighting.bin index 776c2486..f3e5bd23 100644 Binary files a/examples/runtime/shaders/gles/fs_stencil_color_lighting.bin and b/examples/runtime/shaders/gles/fs_stencil_color_lighting.bin differ diff --git a/examples/runtime/shaders/gles/fs_stencil_texture_lighting.bin b/examples/runtime/shaders/gles/fs_stencil_texture_lighting.bin index 3ceba55e..f35896a5 100644 Binary files a/examples/runtime/shaders/gles/fs_stencil_texture_lighting.bin and b/examples/runtime/shaders/gles/fs_stencil_texture_lighting.bin differ diff --git a/examples/runtime/shaders/gles/fs_update_3d.bin b/examples/runtime/shaders/gles/fs_update_3d.bin index b7b8fb4c..1566fb77 100644 Binary files a/examples/runtime/shaders/gles/fs_update_3d.bin and b/examples/runtime/shaders/gles/fs_update_3d.bin differ diff --git a/examples/runtime/shaders/glsl/cs_indirect.bin b/examples/runtime/shaders/glsl/cs_indirect.bin index 146f0f80..9a0b306f 100644 Binary files a/examples/runtime/shaders/glsl/cs_indirect.bin and b/examples/runtime/shaders/glsl/cs_indirect.bin differ diff --git a/examples/runtime/shaders/glsl/cs_init_instances.bin b/examples/runtime/shaders/glsl/cs_init_instances.bin index 8c0aa81a..bd4bd9b6 100644 Binary files a/examples/runtime/shaders/glsl/cs_init_instances.bin and b/examples/runtime/shaders/glsl/cs_init_instances.bin differ diff --git a/examples/runtime/shaders/glsl/cs_update_instances.bin b/examples/runtime/shaders/glsl/cs_update_instances.bin index 04eb1a40..3b695029 100644 Binary files a/examples/runtime/shaders/glsl/cs_update_instances.bin and b/examples/runtime/shaders/glsl/cs_update_instances.bin differ diff --git a/examples/runtime/shaders/glsl/fs_oit_wb_separate.bin b/examples/runtime/shaders/glsl/fs_oit_wb_separate.bin index d77b3479..56a47cab 100644 Binary files a/examples/runtime/shaders/glsl/fs_oit_wb_separate.bin and b/examples/runtime/shaders/glsl/fs_oit_wb_separate.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin b/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin index 492e6e80..7d6487b1 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin and b/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_linear_omni.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin b/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin index 81ea8908..d8f9e902 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin and b/examples/runtime/shaders/glsl/fs_shadowmaps_color_lighting_pcf_omni.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin index 2222aa66..5bbd5e24 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin index cbe48745..04a7b089 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin differ diff --git a/examples/runtime/shaders/glsl/fs_sms_shadow.bin b/examples/runtime/shaders/glsl/fs_sms_shadow.bin index 98147ab0..946d0e83 100644 Binary files a/examples/runtime/shaders/glsl/fs_sms_shadow.bin and b/examples/runtime/shaders/glsl/fs_sms_shadow.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_lighting.bin b/examples/runtime/shaders/glsl/fs_stencil_color_lighting.bin index 4135af92..79774356 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_color_lighting.bin and b/examples/runtime/shaders/glsl/fs_stencil_color_lighting.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_texture_lighting.bin b/examples/runtime/shaders/glsl/fs_stencil_texture_lighting.bin index aa333ccb..b5318939 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_texture_lighting.bin and b/examples/runtime/shaders/glsl/fs_stencil_texture_lighting.bin differ diff --git a/examples/runtime/shaders/glsl/fs_update_3d.bin b/examples/runtime/shaders/glsl/fs_update_3d.bin index 8b9af3fc..f5f2c027 100644 Binary files a/examples/runtime/shaders/glsl/fs_update_3d.bin and b/examples/runtime/shaders/glsl/fs_update_3d.bin differ diff --git a/examples/runtime/shaders/metal/fs_oit_wb_separate.bin b/examples/runtime/shaders/metal/fs_oit_wb_separate.bin index 31687407..0cf73b06 100644 Binary files a/examples/runtime/shaders/metal/fs_oit_wb_separate.bin and b/examples/runtime/shaders/metal/fs_oit_wb_separate.bin differ diff --git a/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_linear_omni.bin b/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_linear_omni.bin index cbe9ee5a..89e922cc 100644 Binary files a/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_linear_omni.bin and b/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_linear_omni.bin differ diff --git a/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_omni.bin b/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_omni.bin index 31a2d699..d9c75ba0 100644 Binary files a/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_omni.bin and b/examples/runtime/shaders/metal/fs_shadowmaps_color_lighting_pcf_omni.bin differ diff --git a/examples/runtime/shaders/metal/fs_shadowvolume_svbackblank.bin b/examples/runtime/shaders/metal/fs_shadowvolume_svbackblank.bin index 187800af..7fddc0e0 100644 Binary files a/examples/runtime/shaders/metal/fs_shadowvolume_svbackblank.bin and b/examples/runtime/shaders/metal/fs_shadowvolume_svbackblank.bin differ diff --git a/examples/runtime/shaders/metal/fs_shadowvolume_svfrontblank.bin b/examples/runtime/shaders/metal/fs_shadowvolume_svfrontblank.bin index 747c3963..682bfa5f 100644 Binary files a/examples/runtime/shaders/metal/fs_shadowvolume_svfrontblank.bin and b/examples/runtime/shaders/metal/fs_shadowvolume_svfrontblank.bin differ diff --git a/examples/runtime/shaders/metal/fs_sms_shadow.bin b/examples/runtime/shaders/metal/fs_sms_shadow.bin index 5281abc6..b5140b48 100644 Binary files a/examples/runtime/shaders/metal/fs_sms_shadow.bin and b/examples/runtime/shaders/metal/fs_sms_shadow.bin differ diff --git a/examples/runtime/shaders/metal/fs_stencil_color_lighting.bin b/examples/runtime/shaders/metal/fs_stencil_color_lighting.bin index ec312f8a..f6898291 100644 Binary files a/examples/runtime/shaders/metal/fs_stencil_color_lighting.bin and b/examples/runtime/shaders/metal/fs_stencil_color_lighting.bin differ diff --git a/examples/runtime/shaders/metal/fs_stencil_texture_lighting.bin b/examples/runtime/shaders/metal/fs_stencil_texture_lighting.bin index ddb659c4..229840b0 100644 Binary files a/examples/runtime/shaders/metal/fs_stencil_texture_lighting.bin and b/examples/runtime/shaders/metal/fs_stencil_texture_lighting.bin differ diff --git a/examples/runtime/shaders/metal/fs_update_3d.bin b/examples/runtime/shaders/metal/fs_update_3d.bin index aa8f3cb2..dfdd88e4 100644 Binary files a/examples/runtime/shaders/metal/fs_update_3d.bin and b/examples/runtime/shaders/metal/fs_update_3d.bin differ diff --git a/src/bgfx_shader.sh b/src/bgfx_shader.sh index 77998652..a675fb6e 100644 --- a/src/bgfx_shader.sh +++ b/src/bgfx_shader.sh @@ -39,6 +39,13 @@ # define bvec4 bool4 # if BGFX_SHADER_LANGUAGE_HLSL > 3 +# if BGFX_SHADER_LANGUAGE_HLSL > 4 +# define dFdxCoarse(_x) ddx_coarse(_x) +# define dFdxFine(_x) ddx_fine(_x) +# define dFdyCoarse(_y) ddy_coarse(-_y) +# define dFdyFine(_y) ddy_fine(-_y) +# endif // BGFX_SHADER_LANGUAGE_HLSL > 4 + struct BgfxSampler2D { SamplerState m_sampler; @@ -239,14 +246,6 @@ float bgfxShadow2DProj(sampler2DShadow _sampler, vec4 _coord) # endif // BGFX_SHADER_LANGUAGE_HLSL > 3 -vec2 vec2_splat(float _x) { return vec2(_x, _x); } -vec3 vec3_splat(float _x) { return vec3(_x, _x, _x); } -vec4 vec4_splat(float _x) { return vec4(_x, _x, _x, _x); } - -uvec2 uvec2_splat(uint _x) { return uvec2(_x, _x); } -uvec3 uvec3_splat(uint _x) { return uvec3(_x, _x, _x); } -uvec4 uvec4_splat(uint _x) { return uvec4(_x, _x, _x, _x); } - vec3 instMul(vec3 _vec, mat3 _mtx) { return mul(_mtx, _vec); } vec3 instMul(mat3 _mtx, vec3 _vec) { return mul(_vec, _mtx); } vec4 instMul(vec4 _vec, mat4 _mtx) { return mul(_mtx, _vec); } @@ -294,12 +293,6 @@ vec4 mod(vec4 _a, vec4 _b) { return _a - _b * floor(_a / _b); } # define SAMPLER3D(_name, _reg) uniform sampler3D _name # define SAMPLERCUBE(_name, _reg) uniform samplerCube _name # define SAMPLER2DSHADOW(_name, _reg) uniform sampler2DShadow _name -# define vec2_splat(_x) vec2(_x) -# define vec3_splat(_x) vec3(_x) -# define vec4_splat(_x) vec4(_x) -# define uvec2_splat(_x) uvec2(_x) -# define uvec3_splat(_x) uvec3(_x) -# define uvec4_splat(_x) uvec4(_x) # if BGFX_SHADER_LANGUAGE_GLSL >= 130 # define ISAMPLER3D(_name, _reg) uniform isampler3D _name @@ -319,6 +312,16 @@ vec3 rcp(vec3 _a) { return vec3(1.0)/_a; } vec4 rcp(vec4 _a) { return vec4(1.0)/_a; } #endif // BGFX_SHADER_LANGUAGE_* +vec2 vec2_splat(float _x) { return vec2(_x, _x); } +vec3 vec3_splat(float _x) { return vec3(_x, _x, _x); } +vec4 vec4_splat(float _x) { return vec4(_x, _x, _x, _x); } + +#if BGFX_SHADER_LANGUAGE_GLSL >= 130 || BGFX_SHADER_LANGUAGE_HLSL +uvec2 uvec2_splat(uint _x) { return uvec2(_x, _x); } +uvec3 uvec3_splat(uint _x) { return uvec3(_x, _x, _x); } +uvec4 uvec4_splat(uint _x) { return uvec4(_x, _x, _x, _x); } +#endif // BGFX_SHADER_LANGUAGE_GLSL >= 130 || BGFX_SHADER_LANGUAGE_HLSL + uniform vec4 u_viewRect; uniform vec4 u_viewTexel; uniform mat4 u_view;