Fixing up Vulkan branch after merge to dali_1.3.26
authorDavid Steele <david.steele@samsung.com>
Thu, 31 May 2018 15:51:53 +0000 (16:51 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:36:22 +0000 (18:36 +0000)
commit614ef267ec8bd9bc9ddd4371a7e838a31f12044e
tree4ef51260f83d6f3f332b2736c8221617413e194a
parent36fda348b59968e584885d6bea5891a5059d86fb
Fixing up Vulkan branch after merge to dali_1.3.26

Re-wrote built-in shaders to match latest toolkit visual shaders
(Removed opacity and uAtlasRect uniforms)

Updated graphics-algorithms and scene-graph-renderer to handle new renderer opacity
Wrapped vulkan debug with test for environment variable.

Fix to texture order to ensure samplers are defined in binding order.

Change-Id: Ie75a0d41970ce31355f8038c7d2111decabf8455
Signed-off-by: David Steele <david.steele@samsung.com>
78 files changed:
build/tizen/Makefile.am
build/tizen/configure.ac
dali/graphics/file.list
dali/graphics/vulkan/api/internal/vulkan-ubo-manager.cpp
dali/graphics/vulkan/api/internal/vulkan-ubo-pool.cpp
dali/graphics/vulkan/api/vulkan-api-render-command.cpp
dali/graphics/vulkan/api/vulkan-api-shader.cpp
dali/graphics/vulkan/generated/basic-shader-frag.h
dali/graphics/vulkan/generated/basic-shader-vert.h
dali/graphics/vulkan/generated/border-visual-anti-aliasing-shader-frag.h
dali/graphics/vulkan/generated/border-visual-anti-aliasing-shader-vert.h
dali/graphics/vulkan/generated/border-visual-shader-frag.h
dali/graphics/vulkan/generated/border-visual-shader-vert.h
dali/graphics/vulkan/generated/builtin-shader-extern-gen.h
dali/graphics/vulkan/generated/builtin-shader-gen.cpp
dali/graphics/vulkan/generated/color-visual-shader-frag.h
dali/graphics/vulkan/generated/color-visual-shader-vert.h
dali/graphics/vulkan/generated/experimental-shader-vert.h
dali/graphics/vulkan/generated/image-visual-atlas-clamp-shader-frag.h
dali/graphics/vulkan/generated/image-visual-atlas-various-wrap-shader-frag.h
dali/graphics/vulkan/generated/image-visual-no-atlas-shader-frag.h
dali/graphics/vulkan/generated/image-visual-shader-frag.h
dali/graphics/vulkan/generated/image-visual-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-normal-map-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-normal-map-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-simple-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-simple-shader-vert.h
dali/graphics/vulkan/generated/npatch-visual-3x3-shader-vert.h
dali/graphics/vulkan/generated/npatch-visual-mask-shader-frag.h [new file with mode: 0644]
dali/graphics/vulkan/generated/npatch-visual-shader-frag.h
dali/graphics/vulkan/generated/npatch-visual-shader-vert.h
dali/graphics/vulkan/generated/text-visual-multi-color-text-shader-frag.h
dali/graphics/vulkan/generated/text-visual-multi-color-text-with-style-shader-frag.h
dali/graphics/vulkan/generated/text-visual-shader-vert.h
dali/graphics/vulkan/generated/text-visual-single-color-text-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-emoji-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-style-and-emoji-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-style-shader-frag.h
dali/graphics/vulkan/generated/wireframe-visual-shader-frag.h
dali/graphics/vulkan/generated/wireframe-visual-shader-vert.h
dali/graphics/vulkan/shaders/border-visual-anti-aliasing-shader.frag
dali/graphics/vulkan/shaders/border-visual-shader.frag
dali/graphics/vulkan/shaders/color-visual-shader.frag
dali/graphics/vulkan/shaders/image-visual-atlas-clamp-shader.frag
dali/graphics/vulkan/shaders/image-visual-atlas-various-wrap-shader.frag
dali/graphics/vulkan/shaders/image-visual-no-atlas-shader.frag
dali/graphics/vulkan/shaders/image-visual-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-normal-map-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-simple-shader.frag
dali/graphics/vulkan/shaders/npatch-visual-3x3-shader.vert
dali/graphics/vulkan/shaders/npatch-visual-mask-shader.frag [new file with mode: 0644]
dali/graphics/vulkan/shaders/npatch-visual-shader.frag
dali/graphics/vulkan/shaders/npatch-visual-shader.vert
dali/graphics/vulkan/shaders/text-visual-multi-color-text-shader.frag
dali/graphics/vulkan/shaders/text-visual-multi-color-text-with-style-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-emoji-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-style-shader.frag
dali/graphics/vulkan/shaders/wireframe-visual-shader.frag
dali/graphics/vulkan/spirv/vulkan-spirv.cpp
dali/graphics/vulkan/vulkan-debug.cpp [new file with mode: 0644]
dali/graphics/vulkan/vulkan-debug.h [new file with mode: 0644]
dali/graphics/vulkan/vulkan-graphics.cpp
dali/graphics/vulkan/vulkan-standalone-test.cpp
dali/integration-api/core-enumerations.h
dali/integration-api/core.cpp
dali/integration-api/debug.h
dali/internal/common/core-impl.cpp
dali/internal/common/core-impl.h
dali/internal/event/rendering/renderer-impl.cpp
dali/internal/update/graphics/graphics-algorithms.cpp
dali/internal/update/rendering/scene-graph-renderer.cpp
dali/internal/update/rendering/scene-graph-renderer.h
dali/internal/update/rendering/scene-graph-texture-set.cpp