Merge branch 'master' into gltfskinning

Browse source

...

This commit is contained in:

Sascha Willems 2020-06-05 20:58:10 +02:00

parent ec023cf581 020a7186f7

commit d4f7b3cc86

1334 changed files with 1239 additions and 1214 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

data/shaders/base/generate-spirv.bat → data/shaders/glsl/base/generate-spirv.bat

Unescape Escape View file

0

data/shaders/base/textoverlay.frag → data/shaders/glsl/base/textoverlay.frag

Unescape Escape View file

0

data/shaders/base/textoverlay.frag.spv → data/shaders/glsl/base/textoverlay.frag.spv

Unescape Escape View file

0

data/shaders/base/textoverlay.vert → data/shaders/glsl/base/textoverlay.vert

Unescape Escape View file

0

data/shaders/base/textoverlay.vert.spv → data/shaders/glsl/base/textoverlay.vert.spv

Unescape Escape View file

0

data/shaders/base/uioverlay.frag → data/shaders/glsl/base/uioverlay.frag

Unescape Escape View file

0

data/shaders/base/uioverlay.frag.spv → data/shaders/glsl/base/uioverlay.frag.spv

Unescape Escape View file

0

data/shaders/base/uioverlay.vert → data/shaders/glsl/base/uioverlay.vert

Unescape Escape View file

0

data/shaders/base/uioverlay.vert.spv → data/shaders/glsl/base/uioverlay.vert.spv

Unescape Escape View file

0

data/shaders/bloom/colorpass.frag → data/shaders/glsl/bloom/colorpass.frag

Unescape Escape View file

0

data/shaders/bloom/colorpass.frag.spv → data/shaders/glsl/bloom/colorpass.frag.spv

Unescape Escape View file

0

data/shaders/bloom/colorpass.vert → data/shaders/glsl/bloom/colorpass.vert

Unescape Escape View file

0

data/shaders/bloom/colorpass.vert.spv → data/shaders/glsl/bloom/colorpass.vert.spv

Unescape Escape View file

0

data/shaders/bloom/gaussblur.frag → data/shaders/glsl/bloom/gaussblur.frag

Unescape Escape View file

0

data/shaders/bloom/gaussblur.frag.spv → data/shaders/glsl/bloom/gaussblur.frag.spv

Unescape Escape View file

0

data/shaders/bloom/gaussblur.vert → data/shaders/glsl/bloom/gaussblur.vert

Unescape Escape View file

0

data/shaders/bloom/gaussblur.vert.spv → data/shaders/glsl/bloom/gaussblur.vert.spv

Unescape Escape View file

0

data/shaders/bloom/generate-spirv.bat → data/shaders/glsl/bloom/generate-spirv.bat

Unescape Escape View file

0

data/shaders/bloom/phongpass.frag → data/shaders/glsl/bloom/phongpass.frag

Unescape Escape View file

0

data/shaders/bloom/phongpass.frag.spv → data/shaders/glsl/bloom/phongpass.frag.spv

Unescape Escape View file

0

data/shaders/bloom/phongpass.vert → data/shaders/glsl/bloom/phongpass.vert

Unescape Escape View file

0

data/shaders/bloom/phongpass.vert.spv → data/shaders/glsl/bloom/phongpass.vert.spv

Unescape Escape View file

0

data/shaders/bloom/skybox.frag → data/shaders/glsl/bloom/skybox.frag

Unescape Escape View file

0

data/shaders/bloom/skybox.frag.spv → data/shaders/glsl/bloom/skybox.frag.spv

Unescape Escape View file

0

data/shaders/bloom/skybox.vert → data/shaders/glsl/bloom/skybox.vert

Unescape Escape View file

0

data/shaders/bloom/skybox.vert.spv → data/shaders/glsl/bloom/skybox.vert.spv

Unescape Escape View file

0

data/shaders/compileshaders.py → data/shaders/glsl/compileshaders.py

Unescape Escape View file

0

data/shaders/computecloth/cloth.comp → data/shaders/glsl/computecloth/cloth.comp

Unescape Escape View file

0

data/shaders/computecloth/cloth.comp.spv → data/shaders/glsl/computecloth/cloth.comp.spv

Unescape Escape View file

0

data/shaders/computecloth/cloth.frag → data/shaders/glsl/computecloth/cloth.frag

Unescape Escape View file

0

data/shaders/computecloth/cloth.frag.spv → data/shaders/glsl/computecloth/cloth.frag.spv

Unescape Escape View file

0

data/shaders/computecloth/cloth.vert → data/shaders/glsl/computecloth/cloth.vert

Unescape Escape View file

0

data/shaders/computecloth/cloth.vert.spv → data/shaders/glsl/computecloth/cloth.vert.spv

Unescape Escape View file

0

data/shaders/computecloth/sphere.frag → data/shaders/glsl/computecloth/sphere.frag

Unescape Escape View file

0

data/shaders/computecloth/sphere.frag.spv → data/shaders/glsl/computecloth/sphere.frag.spv

Unescape Escape View file

0

data/shaders/computecloth/sphere.vert → data/shaders/glsl/computecloth/sphere.vert

Unescape Escape View file

0

data/shaders/computecloth/sphere.vert.spv → data/shaders/glsl/computecloth/sphere.vert.spv

Unescape Escape View file

0

data/shaders/computecullandlod/cull.comp → data/shaders/glsl/computecullandlod/cull.comp

Unescape Escape View file

0

data/shaders/computecullandlod/cull.comp.spv → data/shaders/glsl/computecullandlod/cull.comp.spv

Unescape Escape View file

0

data/shaders/computecullandlod/indirectdraw.frag → data/shaders/glsl/computecullandlod/indirectdraw.frag

Unescape Escape View file

0

data/shaders/computecullandlod/indirectdraw.frag.spv → data/shaders/glsl/computecullandlod/indirectdraw.frag.spv

Unescape Escape View file

0

data/shaders/computecullandlod/indirectdraw.vert → data/shaders/glsl/computecullandlod/indirectdraw.vert

Unescape Escape View file

0

data/shaders/computecullandlod/indirectdraw.vert.spv → data/shaders/glsl/computecullandlod/indirectdraw.vert.spv

Unescape Escape View file

0

data/shaders/computeheadless/headless.comp → data/shaders/glsl/computeheadless/headless.comp

Unescape Escape View file

0

data/shaders/computeheadless/headless.comp.spv → data/shaders/glsl/computeheadless/headless.comp.spv

Unescape Escape View file

0

data/shaders/computenbody/particle.frag → data/shaders/glsl/computenbody/particle.frag

Unescape Escape View file

0

data/shaders/computenbody/particle.frag.spv → data/shaders/glsl/computenbody/particle.frag.spv

Unescape Escape View file

0

data/shaders/computenbody/particle.vert → data/shaders/glsl/computenbody/particle.vert

Unescape Escape View file

0

data/shaders/computenbody/particle.vert.spv → data/shaders/glsl/computenbody/particle.vert.spv

Unescape Escape View file

0

data/shaders/computenbody/particle_calculate.comp → data/shaders/glsl/computenbody/particle_calculate.comp

Unescape Escape View file

0

data/shaders/computenbody/particle_calculate.comp.spv → data/shaders/glsl/computenbody/particle_calculate.comp.spv

Unescape Escape View file

0

data/shaders/computenbody/particle_integrate.comp → data/shaders/glsl/computenbody/particle_integrate.comp

Unescape Escape View file

0

data/shaders/computenbody/particle_integrate.comp.spv → data/shaders/glsl/computenbody/particle_integrate.comp.spv

Unescape Escape View file

0

data/shaders/computeparticles/generate-spirv.bat → data/shaders/glsl/computeparticles/generate-spirv.bat

Unescape Escape View file

0

data/shaders/computeparticles/particle.comp → data/shaders/glsl/computeparticles/particle.comp

Unescape Escape View file

0

data/shaders/computeparticles/particle.comp.spv → data/shaders/glsl/computeparticles/particle.comp.spv

Unescape Escape View file

0

data/shaders/computeparticles/particle.frag → data/shaders/glsl/computeparticles/particle.frag

Unescape Escape View file

0

data/shaders/computeparticles/particle.frag.spv → data/shaders/glsl/computeparticles/particle.frag.spv

Unescape Escape View file

0

data/shaders/computeparticles/particle.vert → data/shaders/glsl/computeparticles/particle.vert

Unescape Escape View file

0

data/shaders/computeparticles/particle.vert.spv → data/shaders/glsl/computeparticles/particle.vert.spv

Unescape Escape View file

0

data/shaders/computeraytracing/generate-spirv.bat → data/shaders/glsl/computeraytracing/generate-spirv.bat

Unescape Escape View file

0

data/shaders/computeraytracing/raytracing.comp → data/shaders/glsl/computeraytracing/raytracing.comp

Unescape Escape View file

0

data/shaders/computeraytracing/raytracing.comp.spv → data/shaders/glsl/computeraytracing/raytracing.comp.spv

Unescape Escape View file

0

data/shaders/computeraytracing/texture.frag → data/shaders/glsl/computeraytracing/texture.frag

Unescape Escape View file

0

data/shaders/computeraytracing/texture.frag.spv → data/shaders/glsl/computeraytracing/texture.frag.spv

Unescape Escape View file

0

data/shaders/computeraytracing/texture.vert → data/shaders/glsl/computeraytracing/texture.vert

Unescape Escape View file

0

data/shaders/computeraytracing/texture.vert.spv → data/shaders/glsl/computeraytracing/texture.vert.spv

Unescape Escape View file

0

data/shaders/computeshader/edgedetect.comp → data/shaders/glsl/computeshader/edgedetect.comp

Unescape Escape View file

0

data/shaders/computeshader/edgedetect.comp.spv → data/shaders/glsl/computeshader/edgedetect.comp.spv

Unescape Escape View file

0

data/shaders/computeshader/emboss.comp → data/shaders/glsl/computeshader/emboss.comp

Unescape Escape View file

0

data/shaders/computeshader/emboss.comp.spv → data/shaders/glsl/computeshader/emboss.comp.spv

Unescape Escape View file

0

data/shaders/computeshader/generate-spirv.bat → data/shaders/glsl/computeshader/generate-spirv.bat

Unescape Escape View file

0

data/shaders/computeshader/sharpen.comp → data/shaders/glsl/computeshader/sharpen.comp

Unescape Escape View file

0

data/shaders/computeshader/sharpen.comp.spv → data/shaders/glsl/computeshader/sharpen.comp.spv

Unescape Escape View file

0

data/shaders/computeshader/texture.frag → data/shaders/glsl/computeshader/texture.frag

Unescape Escape View file

0

data/shaders/computeshader/texture.frag.spv → data/shaders/glsl/computeshader/texture.frag.spv

Unescape Escape View file

0

data/shaders/computeshader/texture.vert → data/shaders/glsl/computeshader/texture.vert

Unescape Escape View file

0

data/shaders/computeshader/texture.vert.spv → data/shaders/glsl/computeshader/texture.vert.spv

Unescape Escape View file

0

data/shaders/conditionalrender/model.frag → data/shaders/glsl/conditionalrender/model.frag

Unescape Escape View file

0

data/shaders/conditionalrender/model.frag.spv → data/shaders/glsl/conditionalrender/model.frag.spv

Unescape Escape View file

0

data/shaders/conditionalrender/model.vert → data/shaders/glsl/conditionalrender/model.vert

Unescape Escape View file

0

data/shaders/conditionalrender/model.vert.spv → data/shaders/glsl/conditionalrender/model.vert.spv

Unescape Escape View file

0

data/shaders/conservativeraster/fullscreen.frag → data/shaders/glsl/conservativeraster/fullscreen.frag

Unescape Escape View file

0

data/shaders/conservativeraster/fullscreen.frag.spv → data/shaders/glsl/conservativeraster/fullscreen.frag.spv

Unescape Escape View file

0

data/shaders/conservativeraster/fullscreen.vert → data/shaders/glsl/conservativeraster/fullscreen.vert

Unescape Escape View file

0

data/shaders/conservativeraster/fullscreen.vert.spv → data/shaders/glsl/conservativeraster/fullscreen.vert.spv

Unescape Escape View file

0

data/shaders/conservativeraster/triangle.frag → data/shaders/glsl/conservativeraster/triangle.frag

Unescape Escape View file

0

data/shaders/conservativeraster/triangle.frag.spv → data/shaders/glsl/conservativeraster/triangle.frag.spv

Unescape Escape View file

0

data/shaders/conservativeraster/triangle.vert → data/shaders/glsl/conservativeraster/triangle.vert

Unescape Escape View file

0

data/shaders/conservativeraster/triangle.vert.spv → data/shaders/glsl/conservativeraster/triangle.vert.spv

Unescape Escape View file

0

data/shaders/conservativeraster/triangleoverlay.frag → data/shaders/glsl/conservativeraster/triangleoverlay.frag

Unescape Escape View file

0

data/shaders/conservativeraster/triangleoverlay.frag.spv → data/shaders/glsl/conservativeraster/triangleoverlay.frag.spv

Unescape Escape View file

0

data/shaders/debugmarker/colorpass.frag → data/shaders/glsl/debugmarker/colorpass.frag

Unescape Escape View file

0

data/shaders/debugmarker/colorpass.frag.spv → data/shaders/glsl/debugmarker/colorpass.frag.spv

Unescape Escape View file

0

data/shaders/debugmarker/colorpass.vert → data/shaders/glsl/debugmarker/colorpass.vert

Unescape Escape View file

0

data/shaders/debugmarker/colorpass.vert.spv → data/shaders/glsl/debugmarker/colorpass.vert.spv

Unescape Escape View file

0

data/shaders/debugmarker/generate-spirv.bat → data/shaders/glsl/debugmarker/generate-spirv.bat

Unescape Escape View file

0

data/shaders/debugmarker/postprocess.frag → data/shaders/glsl/debugmarker/postprocess.frag

Unescape Escape View file

0

data/shaders/debugmarker/postprocess.frag.spv → data/shaders/glsl/debugmarker/postprocess.frag.spv

Unescape Escape View file

0

data/shaders/debugmarker/postprocess.vert → data/shaders/glsl/debugmarker/postprocess.vert

Unescape Escape View file

Some files were not shown because too many files have changed in this diff Show more