From: Adeel Kazmi Date: Fri, 26 Mar 2021 16:22:52 +0000 (+0000) Subject: Merge branch 'devel/master' into devel/graphics X-Git-Tag: graphics-backend-release-1^2~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=416fe5a5deeb51844089bfc9d6055e8852909f97;hp=-c Merge branch 'devel/master' into devel/graphics Change-Id: I1c4d2148118bf84173c014185deb423f0df2916e --- 416fe5a5deeb51844089bfc9d6055e8852909f97 diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt index ee1ff65,47fb5a5..7649466 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@@ -45,6 -45,7 +45,7 @@@ SET(TC_SOURCE utc-Dali-Tooltip.cpp utc-Dali-TransitionData.cpp utc-Dali-Button.cpp + utc-Dali-CameraView.cpp utc-Dali-Control.cpp utc-Dali-ControlImpl.cpp utc-Dali-ItemLayout.cpp @@@ -110,15 -111,6 +111,15 @@@ SET(TEST_HARNESS_SOURCE dali-toolkit-test-utils/test-gesture-generator.cpp dali-toolkit-test-utils/test-gl-abstraction.cpp dali-toolkit-test-utils/test-gl-sync-abstraction.cpp + dali-toolkit-test-utils/test-graphics-buffer.cpp + dali-toolkit-test-utils/test-graphics-command-buffer.cpp + dali-toolkit-test-utils/test-graphics-controller.cpp + dali-toolkit-test-utils/test-graphics-texture.cpp + dali-toolkit-test-utils/test-graphics-pipeline.cpp + dali-toolkit-test-utils/test-graphics-program.cpp + dali-toolkit-test-utils/test-graphics-reflection.cpp + dali-toolkit-test-utils/test-graphics-sampler.cpp + dali-toolkit-test-utils/test-graphics-shader.cpp dali-toolkit-test-utils/test-platform-abstraction.cpp dali-toolkit-test-utils/test-render-controller.cpp dali-toolkit-test-utils/test-trace-call-stack.cpp