Browse Source

Merge pull request #1631 from attilaz/spirv-cross-metal

spirv-cross: removed rename hack
Бранимир Караџић 7 years ago
parent
commit
92b41d942d
24 changed files with 0 additions and 3 deletions
  1. BIN
      examples/runtime/shaders/metal/cs_assao_apply.bin
  2. BIN
      examples/runtime/shaders/metal/cs_assao_generate_importance_map.bin
  3. BIN
      examples/runtime/shaders/metal/cs_assao_generate_q0.bin
  4. BIN
      examples/runtime/shaders/metal/cs_assao_generate_q1.bin
  5. BIN
      examples/runtime/shaders/metal/cs_assao_generate_q2.bin
  6. BIN
      examples/runtime/shaders/metal/cs_assao_generate_q3.bin
  7. BIN
      examples/runtime/shaders/metal/cs_assao_generate_q3base.bin
  8. BIN
      examples/runtime/shaders/metal/cs_assao_load_counter_clear.bin
  9. BIN
      examples/runtime/shaders/metal/cs_assao_non_smart_apply.bin
  10. BIN
      examples/runtime/shaders/metal/cs_assao_non_smart_blur.bin
  11. BIN
      examples/runtime/shaders/metal/cs_assao_non_smart_half_apply.bin
  12. BIN
      examples/runtime/shaders/metal/cs_assao_postprocess_importance_map_a.bin
  13. BIN
      examples/runtime/shaders/metal/cs_assao_postprocess_importance_map_b.bin
  14. BIN
      examples/runtime/shaders/metal/cs_assao_prepare_depth_mip.bin
  15. BIN
      examples/runtime/shaders/metal/cs_assao_prepare_depths.bin
  16. BIN
      examples/runtime/shaders/metal/cs_assao_prepare_depths_and_normals.bin
  17. BIN
      examples/runtime/shaders/metal/cs_assao_prepare_depths_and_normals_half.bin
  18. BIN
      examples/runtime/shaders/metal/cs_assao_prepare_depths_half.bin
  19. BIN
      examples/runtime/shaders/metal/cs_assao_smart_blur.bin
  20. BIN
      examples/runtime/shaders/metal/cs_assao_smart_blur_wide.bin
  21. BIN
      examples/runtime/shaders/metal/cs_indirect.bin
  22. BIN
      examples/runtime/shaders/metal/cs_init_instances.bin
  23. BIN
      examples/runtime/shaders/metal/cs_update_instances.bin
  24. 0 3
      tools/shaderc/shaderc_spirv.cpp

BIN
examples/runtime/shaders/metal/cs_assao_apply.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_importance_map.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_q0.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_q1.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_q2.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_q3.bin


BIN
examples/runtime/shaders/metal/cs_assao_generate_q3base.bin


BIN
examples/runtime/shaders/metal/cs_assao_load_counter_clear.bin


BIN
examples/runtime/shaders/metal/cs_assao_non_smart_apply.bin


BIN
examples/runtime/shaders/metal/cs_assao_non_smart_blur.bin


BIN
examples/runtime/shaders/metal/cs_assao_non_smart_half_apply.bin


BIN
examples/runtime/shaders/metal/cs_assao_postprocess_importance_map_a.bin


BIN
examples/runtime/shaders/metal/cs_assao_postprocess_importance_map_b.bin


BIN
examples/runtime/shaders/metal/cs_assao_prepare_depth_mip.bin


BIN
examples/runtime/shaders/metal/cs_assao_prepare_depths.bin


BIN
examples/runtime/shaders/metal/cs_assao_prepare_depths_and_normals.bin


BIN
examples/runtime/shaders/metal/cs_assao_prepare_depths_and_normals_half.bin


BIN
examples/runtime/shaders/metal/cs_assao_prepare_depths_half.bin


BIN
examples/runtime/shaders/metal/cs_assao_smart_blur.bin


BIN
examples/runtime/shaders/metal/cs_assao_smart_blur_wide.bin


BIN
examples/runtime/shaders/metal/cs_indirect.bin


BIN
examples/runtime/shaders/metal/cs_init_instances.bin


BIN
examples/runtime/shaders/metal/cs_update_instances.bin


+ 0 - 3
tools/shaderc/shaderc_spirv.cpp

@@ -844,9 +844,6 @@ namespace bgfx { namespace spirv
 						{
 							unsigned binding = msl.get_decoration(resource.id, spv::DecorationBinding);
 							msl.set_decoration(resource.id, spv::DecorationBinding, binding + 1);
-
-							// workaround spirv -> msl codegen problem: same name was used as struct type and function parameter name
-							msl.set_name(resource.id, "_" + msl.get_name(resource.id));
 						}
 
 						std::string source = msl.compile();