Closed fungos closed 9 years ago
hmm I'm getting a merge conflict in BgfxShaderEmbedded.py get_shaderc_path(), my repo has this block:
shaderc_ext = ''
if platform.system().lower() == 'windows':
shaderc_ext += '.exe'
before the:
shaderc_path = os.path.abspath('{}/shaderc'.format(deploy_path) + shaderc_ext)
Can you have a look (I guess the way to resolve this is to do a merge from upstream into your branch, resolve the conflicts and then push again, hopefully the PR will update automatically.
Btw: I'll have a PR for fips-imgui soon, which updates it to 1.44 (which has a slightly incompatible API).
Right, fixed the conflict. Also, I'll be waiting the imgui update! :+1:
...and merged. Thanks :)
Sync submodules to bgfx and bx head. This also fix some problems with shader generation when starting from a clean project. Added a version number so a build after a gen will trigger the generation. There is a also a minor fix to compute shader compilation.