Peter M. Groen / dali-demo

Commit 3d3f8c933c2dfc8cccc6f426836fbf9c169fb96f

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents dce2e8e0 7bd3e6c7

Merge "Use dali-shader-generator to generate the shaders" into devel/master

Inline Side-by-side
Showing 3 changed files with 22 additions and 127 deletions
build/android/dali/build_toolkit.sh
  View file @3d3f8c9
@@ -15,6 +15,10 @@ else @@ -15,6 +15,10 @@ else
15 export ENABLE_TRACE=OFF 15 export ENABLE_TRACE=OFF
16 fi 16 fi
17 17
  18 + if [ -z "$CXX" ]; then
  19 + export CXX="g++"
  20 + fi
  21 +
18 export PREFIX=${DALI_ENV_DIR} 22 export PREFIX=${DALI_ENV_DIR}
19 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig 23 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig
20 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig 24 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
@@ -23,7 +27,7 @@ else @@ -23,7 +27,7 @@ else
23 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files 27 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files
24 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files 28 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files
25 29
26 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='720x1280' 30 + ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='720x1280' -DANDROID_HOST_COMPILER="$CXX"
27 fi 31 fi
28 32
29 make -j8 || exit 1 33 make -j8 || exit 1
build/tizen/examples/CMakeLists.txt
  View file @3d3f8c9
@@ -20,16 +20,13 @@ IF (NOT "${ENABLE_SCENE_LOADER}" ) @@ -20,16 +20,13 @@ IF (NOT "${ENABLE_SCENE_LOADER}" )
20 ENDIF() 20 ENDIF()
21 ENDIF() 21 ENDIF()
22 22
  23 +FIND_PROGRAM( SHADER_GENERATOR "dali-shader-generator" )
  24 +IF( NOT SHADER_GENERATOR )
  25 + MESSAGE( FATAL_ERROR "dali-shader-generator not found!" )
  26 +ENDIF()
  27 +
23 FOREACH(EXAMPLE ${SUBDIRS}) 28 FOREACH(EXAMPLE ${SUBDIRS})
24 - # Generate source files for shaders  
25 - SET(SHADER_SOURCE_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/shaders/")  
26 - SET(SHADER_GENERATED_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/generated/")  
27 SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../") 29 SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
28 - IF (EXISTS ${SHADER_SOURCE_DIR})  
29 - EXECUTE_PROCESS( COMMAND bash -c "${PARENT_CMAKE_SOURCE_DIR}/shader-generator.sh ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR} --skip")  
30 - SET_PROPERTY( DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES  
31 - "${SHADER_GENERATED_DIR}" )  
32 - ENDIF()  
33 FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp") 30 FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
34 SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp") 31 SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
35 IF(SHARED) 32 IF(SHARED)
@@ -37,6 +34,18 @@ FOREACH(EXAMPLE ${SUBDIRS}) @@ -37,6 +34,18 @@ FOREACH(EXAMPLE ${SUBDIRS})
37 ELSE() 34 ELSE()
38 ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS}) 35 ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
39 ENDIF() 36 ENDIF()
  37 +
  38 + # Generate source files for shaders
  39 + SET(SHADER_SOURCE_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/shaders/")
  40 + IF (EXISTS ${SHADER_SOURCE_DIR})
  41 + SET(SHADER_GENERATED_DIR "${EXAMPLES_SRC_DIR}/${EXAMPLE}/generated/")
  42 + ADD_CUSTOM_TARGET(${EXAMPLE}-generate-shaders
  43 + COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
  44 + SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
  45 + "${SHADER_GENERATED_DIR}")
  46 + ADD_DEPENDENCIES(${EXAMPLE}.example ${EXAMPLE}-generate-shaders)
  47 + ENDIF()
  48 +
40 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS}) 49 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS})
41 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR}) 50 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
42 ENDFOREACH(EXAMPLE) 51 ENDFOREACH(EXAMPLE)
build/tizen/shader-generator.sh deleted
View file @dce2e8e
1 -#!/bin/bash  
2 -  
3 -# Set Colors  
4 -Red='\033[0;31m' # Red  
5 -Yellow='\033[0;33m' # Yellow  
6 -Blue='\033[0;34m' # Blue  
7 -Clear='\033[0m' # Text Reset  
8 -  
9 -#########################################################################################  
10 -  
11 -Usage()  
12 -{  
13 - echo -e "${Yellow}Usage: $(basename ${BASH_SOURCE[0]}) [indir] [outdir] [OPTIONS]"  
14 - echo  
15 - echo -e " ${Blue}Mandatory parameters:${Clear}"  
16 - echo -e " indir The input directory where the original shader files are located"  
17 - echo -e " outdir The output directory where the header files for the shaders should be generated"  
18 - echo -e " ${Red}NOTE: All the above parameters must be provided${Clear}"  
19 - echo  
20 - echo -e " ${Blue}Options:${Clear}"  
21 - echo -e " -s|--skip Skip the generation of header and cpp files that include all the generated shader header files"  
22 - echo -e " -h|--help Help"  
23 -}  
24 -  
25 -if [ "$1" = "-h" ] || [ "$1" = "--help" ]  
26 -then  
27 - Usage  
28 - exit 0  
29 -elif [ "$#" -lt 2 ]  
30 -then  
31 - echo -e "${Red}ERROR:${Clear} Mandatory parameters are not provided"  
32 - echo  
33 - Usage  
34 - exit 1  
35 -fi  
36 -  
37 -#########################################################################################  
38 -  
39 -indir=$1  
40 -outdir=$2  
41 -skip=""  
42 -  
43 -for option in $*  
44 -do  
45 - if [ "$option" = "-s" ] || [ "$option" = "--skip" ]  
46 - then  
47 - skip="--skip"  
48 - continue  
49 - elif [[ $option == -* ]]  
50 - then  
51 - echo -e "${Red}Invalid Option: ${Blue}$option${Clear}"  
52 - echo  
53 - Usage  
54 - exit 1  
55 - fi  
56 -done  
57 -  
58 -#########################################################################################  
59 -  
60 -mkdir -p $outdir  
61 -  
62 -if [ ! -e $indir ] ; then  
63 - echo "Error: The folder \""$indir"\" does not exist!"  
64 - exit 1  
65 -fi  
66 -  
67 -cd $indir  
68 -all_shaders=$(ls -1 *.{vert,frag,def} 2>/dev/null)  
69 -cd $OLDPWD  
70 -  
71 -# Generate one header file per shader which is defined as a const std::string_view  
72 -for name in $all_shaders ; do  
73 - echo "Generating header files for $name..."  
74 - varname=$(echo "SHADER_$name" | tr [a-z] [A-Z] | sed -e 's/-/_/g;s/\./_/g;')  
75 -  
76 - newname=$(echo ${name} | sed -e 's/\./-/;')".h"  
77 - echo Writing $newname  
78 -  
79 - shader_fullpath=$(echo ${indir})$name  
80 -  
81 - header_name="${varname}_GEN_H"  
82 - echo "const std::string_view" "$varname""{" > $outdir/$newname  
83 - cat $shader_fullpath | sed -e 's/^..*$/"&\\n"/' >> $outdir/$newname  
84 - echo "};" >> $outdir/$newname  
85 -done  
86 -  
87 -if [ "$skip" != "--skip" ]; then  
88 - # Generate one cpp file that includes all the previously generated string_views for shaders  
89 - echo "Generating cpp file..."  
90 - echo -e "#include \"../builtin-shader-extern-gen.h\"\n" > $outdir/builtin-shader-gen.cpp  
91 -  
92 - varnames=  
93 - for name in $all_shaders ; do  
94 - varname=$(echo "SHADER_$name" | tr [a-z] [A-Z] | sed -e 's/-/_/g;s/\./_/g;')  
95 - newname=$(echo ${name} | sed -e 's/\./-/;')".h"  
96 - varnames="${varnames} $varname"  
97 - echo "#include \"$newname\"" >> $outdir/builtin-shader-gen.cpp  
98 - done  
99 -  
100 - # Generate one header file that defines all the shader string_views as extern variables  
101 - echo "Generating extern header file ( for external use )..."  
102 - echo "#ifndef GRAPHICS_BUILTIN_SHADER_EXTERN_GEN_H" > $outdir/../builtin-shader-extern-gen.h  
103 - echo -e "#define GRAPHICS_BUILTIN_SHADER_EXTERN_GEN_H\n" >> $outdir/../builtin-shader-extern-gen.h  
104 -  
105 - echo "#include <string_view>" >> $outdir/../builtin-shader-extern-gen.h  
106 - echo "" >> $outdir/../builtin-shader-extern-gen.h  
107 -  
108 - for name in $all_shaders ; do  
109 - varname=$(echo "SHADER_$name" | tr [a-z] [A-Z] | sed -e 's/-/_/g;s/\./_/g;')  
110 - newname=$(echo ${name} | sed -e 's/\./-/;')".h"  
111 - echo "extern const std::string_view $varname;" >> $outdir/../builtin-shader-extern-gen.h  
112 - done  
113 - cat >> $outdir/../builtin-shader-extern-gen.h << EOF  
114 -  
115 -#endif // GRAPHICS_BUILTIN_SHADER_EXTERN_GEN_H  
116 -EOF  
117 -fi  
118 -