fix more sapp samples for bindings cleanup

floooh · Oct 14, 2024 · d35ddac · d35ddac
1 parent c17b13b
commit d35ddac
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/sapp/CMakeLists.txt b/sapp/CMakeLists.txt
@@ -535,30 +535,30 @@ fips_begin_app(sgl-microui-sapp-ui windowed)
     target_compile_definitions(sgl-microui-sapp-ui PRIVATE USE_DBG_UI)
 fips_end_app()
 
-#fips_ide_group(Samples)
-#fips_begin_app(nuklear-sapp windowed)
-#    fips_files(nuklear-sapp.c)
-#    fips_deps(sokol nuklear)
-#fips_end_app()
-#fips_ide_group(SamplesWithDebugUI)
-#fips_begin_app(nuklear-sapp-ui windowed)
-#    fips_files(nuklear-sapp.c)
-#    fips_deps(sokol nuklear dbgui)
-#    target_compile_definitions(nuklear-sapp-ui PRIVATE USE_DBG_UI)
-#fips_end_app()
-#
-#fips_ide_group(Samples)
-#fips_begin_app(nuklear-images-sapp windowed)
-#    fips_files(nuklear-images-sapp.c)
-#    fips_deps(sokol nuklear)
-#fips_end_app()
-#fips_ide_group(SamplesWithDebugUI)
-#fips_begin_app(nuklear-images-sapp-ui windowed)
-#    fips_files(nuklear-images-sapp.c)
-#    fips_deps(sokol nuklear dbgui)
-#    target_compile_definitions(nuklear-images-sapp-ui PRIVATE USE_DBG_UI)
-#fips_end_app()
-#
+fips_ide_group(Samples)
+fips_begin_app(nuklear-sapp windowed)
+    fips_files(nuklear-sapp.c)
+    fips_deps(sokol nuklear)
+fips_end_app()
+fips_ide_group(SamplesWithDebugUI)
+fips_begin_app(nuklear-sapp-ui windowed)
+    fips_files(nuklear-sapp.c)
+    fips_deps(sokol nuklear dbgui)
+    target_compile_definitions(nuklear-sapp-ui PRIVATE USE_DBG_UI)
+fips_end_app()
+
+fips_ide_group(Samples)
+fips_begin_app(nuklear-images-sapp windowed)
+    fips_files(nuklear-images-sapp.c)
+    fips_deps(sokol nuklear)
+fips_end_app()
+fips_ide_group(SamplesWithDebugUI)
+fips_begin_app(nuklear-images-sapp-ui windowed)
+    fips_files(nuklear-images-sapp.c)
+    fips_deps(sokol nuklear dbgui)
+    target_compile_definitions(nuklear-images-sapp-ui PRIVATE USE_DBG_UI)
+fips_end_app()
+
 fips_ide_group(Samples)
 fips_begin_app(cubemaprt-sapp windowed)
     fips_files(cubemaprt-sapp.c)
@@ -946,21 +946,21 @@ fips_begin_app(spine-switch-skinsets-sapp-ui windowed)
     target_compile_definitions(spine-switch-skinsets-sapp-ui PRIVATE USE_DBG_UI)
 fips_end_app()
 
-#fips_ide_group(Samples)
-#fips_begin_app(ozz-anim-sapp windowed)
-#    fips_files(ozz-anim-sapp.cc)
-#    fips_dir(data)
-#    fipsutil_copy(ozz-anim-assets.yml)
-#    fips_deps(sokol fileutil ozzanim imgui)
-#fips_end_app()
-#
-#fips_begin_app(ozz-skin-sapp windowed)
-#    fips_files(ozz-skin-sapp.cc)
-#    sokol_shader(ozz-skin-sapp.glsl ${slang})
-#    fips_dir(data)
-#    fipsutil_copy(ozz-skin-assets.yml)
-#    fips_deps(sokol fileutil ozzanim imgui)
-#fips_end_app()
+fips_ide_group(Samples)
+fips_begin_app(ozz-anim-sapp windowed)
+    fips_files(ozz-anim-sapp.cc)
+    fips_dir(data)
+    fipsutil_copy(ozz-anim-assets.yml)
+    fips_deps(sokol fileutil ozzanim imgui)
+fips_end_app()
+
+# fips_begin_app(ozz-skin-sapp windowed)
+#     fips_files(ozz-skin-sapp.cc)
+#     sokol_shader(ozz-skin-sapp.glsl ${slang})
+#     fips_dir(data)
+#     fipsutil_copy(ozz-skin-assets.yml)
+#     fips_deps(sokol fileutil ozzanim imgui)
+# fips_end_app()
 #
 #fips_begin_app(ozz-storagebuffer-sapp windowed)
 #    fips_files(ozz-storagebuffer-sapp.cc)

diff --git a/sapp/ozz-skin-sapp.glsl b/sapp/ozz-skin-sapp.glsl
@@ -45,15 +45,15 @@ void skinned_pos_nrm(in vec4 pos, in vec4 nrm, in vec4 skin_weights, in vec4 ski
 @end
 
 @vs vs
-uniform vs_params {
+layout(binding=0) uniform vs_params {
     mat4 view_proj;
     float joint_pixel_width;
 };
 
 @image_sample_type joint_tex unfilterable_float
-uniform texture2D joint_tex;
+layout(binding=0) uniform texture2D joint_tex;
 @sampler_type smp nonfiltering
-uniform sampler smp;
+layout(binding=0) uniform sampler smp;
 
 in vec4 position;
 in vec4 normal;