Merge branch 'master' into libktx

2019-08-05 07:21:30 +02:00 · 2019-08-05 07:21:30 +02:00 · a6d9b57d7c
commit a6d9b57d7c
parent b67c35299b c3f1692486
69 changed files with 78 additions and 134 deletions
--- a/android/examples/_template/build.gradle
+++ b/android/examples/_template/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/bloom/build.gradle
+++ b/android/examples/bloom/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computecloth/build.gradle
+++ b/android/examples/computecloth/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computecullandlod/build.gradle
+++ b/android/examples/computecullandlod/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computeheadless/build.gradle
+++ b/android/examples/computeheadless/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computenbody/build.gradle
+++ b/android/examples/computenbody/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computeparticles/build.gradle
+++ b/android/examples/computeparticles/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computeraytracing/build.gradle
+++ b/android/examples/computeraytracing/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/computeshader/build.gradle
+++ b/android/examples/computeshader/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/conservativeraster/build.gradle
+++ b/android/examples/conservativeraster/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/debugmarker/build.gradle
+++ b/android/examples/debugmarker/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/deferred/build.gradle
+++ b/android/examples/deferred/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/deferredmultisampling/build.gradle
+++ b/android/examples/deferredmultisampling/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/deferredshadows/build.gradle
+++ b/android/examples/deferredshadows/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/descriptorsets/build.gradle
+++ b/android/examples/descriptorsets/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/displacement/build.gradle
+++ b/android/examples/displacement/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/distancefieldfonts/build.gradle
+++ b/android/examples/distancefieldfonts/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/dynamicuniformbuffer/build.gradle
+++ b/android/examples/dynamicuniformbuffer/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/gears/build.gradle
+++ b/android/examples/gears/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/geometryshader/build.gradle
+++ b/android/examples/geometryshader/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/hdr/build.gradle
+++ b/android/examples/hdr/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/imgui/build.gradle
+++ b/android/examples/imgui/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/indirectdraw/build.gradle
+++ b/android/examples/indirectdraw/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/inlineuniformblocks/build.gradle
+++ b/android/examples/inlineuniformblocks/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/inputattachments/build.gradle
+++ b/android/examples/inputattachments/build.gradle
@ -40,7 +40,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/instancing/build.gradle
+++ b/android/examples/instancing/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/mesh/build.gradle
+++ b/android/examples/mesh/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/multisampling/build.gradle
+++ b/android/examples/multisampling/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/multithreading/build.gradle
+++ b/android/examples/multithreading/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/multiview/build.gradle
+++ b/android/examples/multiview/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/negativeviewportheight/build.gradle
+++ b/android/examples/negativeviewportheight/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/occlusionquery/build.gradle
+++ b/android/examples/occlusionquery/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/offscreen/build.gradle
+++ b/android/examples/offscreen/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/parallaxmapping/build.gradle
+++ b/android/examples/parallaxmapping/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/particlefire/build.gradle
+++ b/android/examples/particlefire/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pbrbasic/build.gradle
+++ b/android/examples/pbrbasic/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pbribl/build.gradle
+++ b/android/examples/pbribl/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pbrtexture/build.gradle
+++ b/android/examples/pbrtexture/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pipelines/build.gradle
+++ b/android/examples/pipelines/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pipelinestatistics/build.gradle
+++ b/android/examples/pipelinestatistics/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pushconstants/build.gradle
+++ b/android/examples/pushconstants/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/pushdescriptors/build.gradle
+++ b/android/examples/pushdescriptors/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/radialblur/build.gradle
+++ b/android/examples/radialblur/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/renderheadless/build.gradle
+++ b/android/examples/renderheadless/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/scenerendering/build.gradle
+++ b/android/examples/scenerendering/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/screenshot/build.gradle
+++ b/android/examples/screenshot/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/shadowmapping/build.gradle
+++ b/android/examples/shadowmapping/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/shadowmappingcascade/build.gradle
+++ b/android/examples/shadowmappingcascade/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/shadowmappingomni/build.gradle
+++ b/android/examples/shadowmappingomni/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/skeletalanimation/build.gradle
+++ b/android/examples/skeletalanimation/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/specializationconstants/build.gradle
+++ b/android/examples/specializationconstants/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/sphericalenvmapping/build.gradle
+++ b/android/examples/sphericalenvmapping/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/ssao/build.gradle
+++ b/android/examples/ssao/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/stencilbuffer/build.gradle
+++ b/android/examples/stencilbuffer/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/subpasses/build.gradle
+++ b/android/examples/subpasses/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/terraintessellation/build.gradle
+++ b/android/examples/terraintessellation/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/tessellation/build.gradle
+++ b/android/examples/tessellation/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/textoverlay/build.gradle
+++ b/android/examples/textoverlay/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/texture/build.gradle
+++ b/android/examples/texture/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/texture3d/build.gradle
+++ b/android/examples/texture3d/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/texturearray/build.gradle
+++ b/android/examples/texturearray/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/texturecubemap/build.gradle
+++ b/android/examples/texturecubemap/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/texturemipmapgen/build.gradle
+++ b/android/examples/texturemipmapgen/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/triangle/build.gradle
+++ b/android/examples/triangle/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/viewportarray/build.gradle
+++ b/android/examples/viewportarray/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"
--- a/android/examples/vulkanscene/build.gradle
+++ b/android/examples/vulkanscene/build.gradle
@ -35,7 +35,7 @@ android {
    }
 }

-task copyTask << {
+task copyTask {
    copy {
        from '../../common/res/drawable'
        into "src/main/res/drawable"