Skip to content

Commit be6c145

Browse files
ReneThraneReneThrane
committed
Release 6.4.0
* Now require a compiler with [C++20](https://en.cppreference.com/w/cpp/compiler_support/20) support. * New OpenCL samples * ColorSeg * GaussianFilter * Gray2Rgb * MedianFilter * MorphoDilate * MorphoErode * Rgb2Gray * Rgb2Hsv * Rgb888ToRgb565 * Rgb888ToUYVY * SobelHFilter * SobelVFilter * New OpenGL ES2 samples * System.Gestures * UI.RenderTest * New OpenGL ES3 samples * System.Gestures * UI.RenderTest * UI.Gestures * New Vulkan samples * System.EasingFunctions * System.Gestures * UI.RenderTest * UI.Gestures * Added new demo app templates * OpenGLES3.HDR * Vulkan.HDR * New OpenGL ES 2+3 command line arguments * ```--EGLSampleBuffers <arg>``` Force EGL_SAMPLE_BUFFERS to the given value * ```--EGLSamples <arg>``` Force EGL_SAMPLES to the given value * FslSimpleUI * Reworked the way colors are handled so we can better support SRGB and HDR rendering. * All control color properties are now represented by UIColor instead of Color (16bit per channel and color space info). * Rendering uses UIRenderColor which stores the colors using 16bit per channel mathing the frame buffer format (linear/non-linear). * Basic gesture support. * Basic scroll view with gesture support. * FslSimpleUI.Delcarative updated to support most controls, it can also now dump a xsd from code describing the possibilities. * The default theme texture atlas is now generated in two versions * NonLinear (premultiply alpha is done directly on the non-linear SRGB colors, like we used to do) * Linear (premultiply alpha is done by transforming the RGB colors to linear values and applying the alpha, then converting back to non-linear). * Support for line rendering for charts. * Misc * Clang tidy now enforces naming conventions. * HDR screenshot support. * ImageConverter service updated. * Added FslDemoService.ImageConverter.HDR service. * Added FslGraphics2D.PixelFormatConverter package. * BasicRender line list+strip support. * Stats sample now show CPU chars (GLES2, GLES3, Vulkan). * TightBitmap added for the cases where you need to work on bitmap data where the data is tighly packed in memory. * ```StringViewLite``` now utilize a ```std::string_view``` internally. * ```ReadOnlySpan``` now utilize a ```std::span<const T>``` internally. * ```Span``` now utilize a ```std::span<T>``` internally. * Updated easing function in FslBase * Many old classes now utilize span's instead of pointer, length. * UIDemoAppLegacyExtension was removed and all samples using it updated to use UIDemoAppExtension. Change-Id: Ie5f4080c7b9b895e85acad9ca3286f94b1bf29af
1 parent 4bdb1c4 commit be6c145

File tree

3,233 files changed

+107824
-34399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,233 files changed

+107824
-34399
lines changed

‎.Config/FslBuildGen/BuildConfig/PerformClangTidy.py‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,9 @@ class PerformClangTidyHelper(object):
717717
VAR_FLAGS = "FLAGS"
718718
VAR_INCLUDES = "INCLUDES"
719719
VAR_SYSTEM_INCLUDES = "SYSTEM_INCLUDES"
720-
VAR_POSTFIX_ARGS = "POSTFIX_ARGS"
720+
VAR_USERARGS_TIDY = "USERARGS_TIDY"
721+
VAR_POSTFIX_ARGS_CLANG = "POSTFIX_ARGS_CLANG"
722+
VAR_POSTFIX_ARGS_TIDY = "POSTFIX_ARGS_TIDY"
721723
VAR_YAML_FILE = "YAML_FILE"
722724
VAR_CUSTOM_CHECKS = "CUSTOM_CHECKS"
723725

@@ -945,40 +947,46 @@ def GenerateNinjaTidyFile(log: Log, ninjaOutputFile: str, clangTidyFixOutputFold
945947
emptyStringList = [] # type: List[str]
946948
writer.variable(key=PerformClangTidyHelper.VAR_FLAGS, value=tidyPlatformConfig.PlatformCompilerFlags)
947949
writer.variable(key=PerformClangTidyHelper.VAR_PLATFORM_DEFINES, value=_AddCmdToEachEntry("-D", tidyPlatformConfig.PlatformDefineCommands))
948-
writer.variable(key=PerformClangTidyHelper.VAR_POSTFIX_ARGS, value=performClangTidyConfig.AdditionalUserArguments)
950+
writer.variable(key=PerformClangTidyHelper.VAR_USERARGS_TIDY, value=performClangTidyConfig.AdditionalUserArguments)
951+
writer.variable(key=PerformClangTidyHelper.VAR_POSTFIX_ARGS_CLANG, value="")
952+
writer.variable(key=PerformClangTidyHelper.VAR_POSTFIX_ARGS_TIDY, value=performClangTidyConfig.PostfixArguments)
949953
writer.variable(key=PerformClangTidyHelper.VAR_PACKAGE_DEFINES, value=emptyStringList)
950954
writer.variable(key=PerformClangTidyHelper.VAR_INCLUDES, value=emptyStringList)
951955
writer.variable(key=PerformClangTidyHelper.VAR_SYSTEM_INCLUDES, value=emptyStringList)
952956
writer.variable(key=PerformClangTidyHelper.VAR_YAML_FILE, value=emptyStringList)
953957
writer.variable(key=PerformClangTidyHelper.VAR_CUSTOM_CHECKS, value=customChecks)
954958

955-
compilerArguments = "${0} ${1} ${2} ${3} ${4} ${5}".format(PerformClangTidyHelper.VAR_FLAGS,
956-
PerformClangTidyHelper.VAR_PLATFORM_DEFINES,
957-
PerformClangTidyHelper.VAR_INCLUDES,
958-
PerformClangTidyHelper.VAR_SYSTEM_INCLUDES,
959-
PerformClangTidyHelper.VAR_PACKAGE_DEFINES,
960-
PerformClangTidyHelper.VAR_POSTFIX_ARGS)
959+
compilerArgumentsClang = "${0} ${1} ${2} ${3} ${4} ${5}".format(PerformClangTidyHelper.VAR_FLAGS,
960+
PerformClangTidyHelper.VAR_PLATFORM_DEFINES,
961+
PerformClangTidyHelper.VAR_INCLUDES,
962+
PerformClangTidyHelper.VAR_SYSTEM_INCLUDES,
963+
PerformClangTidyHelper.VAR_PACKAGE_DEFINES,
964+
PerformClangTidyHelper.VAR_POSTFIX_ARGS_CLANG)
965+
compilerUserArgumentsTidy = "${0}".format(PerformClangTidyHelper.VAR_USERARGS_TIDY)
966+
compilerArgumentsTidy = "${0} ${1} ${2} ${3} ${4} ${5}".format(PerformClangTidyHelper.VAR_FLAGS,
967+
PerformClangTidyHelper.VAR_PLATFORM_DEFINES,
968+
PerformClangTidyHelper.VAR_INCLUDES,
969+
PerformClangTidyHelper.VAR_SYSTEM_INCLUDES,
970+
PerformClangTidyHelper.VAR_PACKAGE_DEFINES,
971+
PerformClangTidyHelper.VAR_POSTFIX_ARGS_TIDY)
961972

962973
writer.rule(name=PerformClangTidyHelper.RULE_COMPILE,
963974
depfile="$out.d",
964-
command="{0} -c -x c++ $in -o $out -MD -MF $out.d {1}".format(clangExeInfo.Command, compilerArguments),
965-
#command="{0} -c -x c++ $in -o $out -MD -MF $out.d @$out.rsp".format(clangExeInfo.Command),
966-
#rspfile="$out.rsp",
967-
#rspfile_content=compilerArguments
975+
command="{0} -c -x c++ $in -o $out -MD -MF $out.d {1}".format(clangExeInfo.Command, compilerArgumentsClang),
968976
)
969977

970978
tidyChecks = "" if customChecks is None else "--checks ${0} ".format(PerformClangTidyHelper.VAR_CUSTOM_CHECKS)
971979
tidyCommand = ""
972980
if performClangTidyConfig.Repair:
973-
tidyCommand = "{0} $in --export-fixes=${1} {2}-- {3}".format(clangTidyExeInfo.Command, PerformClangTidyHelper.VAR_YAML_FILE,
974-
tidyChecks, compilerArguments)
981+
tidyCommand = "{0} $in --export-fixes=${1} {2} {3} -- {4}".format(clangTidyExeInfo.Command, PerformClangTidyHelper.VAR_YAML_FILE,
982+
tidyChecks, compilerUserArgumentsTidy, compilerArgumentsTidy)
975983
else:
976-
tidyCommand = "{0} $in {1}-- {2}".format(clangTidyExeInfo.Command, tidyChecks, compilerArguments)
984+
tidyCommand = "{0} $in {1} {2} -- {3}".format(clangTidyExeInfo.Command, tidyChecks, compilerUserArgumentsTidy, compilerArgumentsTidy)
977985

978986
writer.rule(name=PerformClangTidyHelper.RULE_TIDY,
979987
command=tidyCommand,
980988
#rspfile="$out.rsp",
981-
#rspfile_content="{0}-- {1}".format(tidyChecks, compilerArguments),
989+
#rspfile_content="{0}-- {1}".format(tidyChecks, compilerArgumentsTidy),
982990
restat=True)
983991

984992
toolProjectContextsDict = PackagePathUtil.CreateToolProjectContextsDict(toolConfig.ProjectInfo)

‎.Config/FslBuildGen/Generator/GeneratorCMake.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,19 @@ def _GetPackageRelativePath(toolConfig: ToolConfig, package: Package) -> str:
492492
rootDirectory = GeneratorCMake._GetPackageRootPath(toolConfig, package)
493493
packageRelativePath = package.AbsolutePath[len(rootDirectory.ResolvedPathEx):]
494494
packageRelativePath = IOUtil.GetDirectoryName(packageRelativePath)
495-
return IOUtil.Join(packageRelativePath, package.NameInfo.ShortName.Value)
495+
496+
# We can not just use the short name as dir names might include "." which is excluded from the short name
497+
# We can also not just use the IOUtil.GetFileName(package.ResolvedPath.ResolvedPath) name as it dont include the flavor name
498+
# We can also not just use package.Name.
499+
packageShortName = package.NameInfo.ShortName.Value
500+
packageDirName = packageShortName
501+
if package.ResolvedPath is not None:
502+
packageDirName = IOUtil.GetFileName(package.ResolvedPath.ResolvedPath)
503+
variantNameStarIndex = packageShortName.find('___')
504+
if variantNameStarIndex >= 0:
505+
packageDirName = packageDirName + packageShortName[variantNameStarIndex:]
506+
507+
return IOUtil.Join(packageRelativePath, packageDirName)
496508

497509
@staticmethod
498510
def _GetPackageBuildFileName(toolConfig: ToolConfig, cmakeBuildPackageDir: str, package: Package) -> str:

‎.Config/FslBuildGen/Tool/ToolAppMain.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
from FslBuildGen.Xml.Project.XmlProjectRootConfigFile import XmlProjectRootConfigFile
7474

7575

76-
CurrentVersion = Version(3, 6, 3, 1)
76+
CurrentVersion = Version(3, 7, 0, 0)
7777

7878

7979
def __AddDefaultOptions(parser: argparse.ArgumentParser, allowStandaloneMode: bool) -> None:

‎.Config/Import.gen/DemoAppGLES3.HDR.gen‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FslBuildTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FslBuildTemplate.xsd">
3+
<Dependency Name="FslDemoApp.OpenGLES3.HDR"/>
4+
</FslBuildTemplate>

‎.Config/Import.gen/DemoAppVulkan.HDR.gen‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FslBuildTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../FslBuildTemplate.xsd">
3+
<Dependency Name="FslDemoApp.Vulkan.HDR"/>
4+
</FslBuildTemplate>

‎.Config/Jenkins/yocto/PrepareJenkinsEnvironment.sh‎

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,12 @@
11
#!/bin/bash
22

3-
# Build recipe caching setup
4-
localJobName=$JOB_NAME
5-
localJobName+='_'
6-
localJobName+=$EXECUTOR_NUMBER
7-
8-
if [ ! -n "${FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR+1}" ]; then
9-
if [ -n "${FSL_JENKINS_THIRD_PARTY_INSTALL+1}" ]; then
10-
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR=$FSL_JENKINS_THIRD_PARTY_INSTALL/WorkspaceInstall/$EXECUTOR_NUMBER
11-
elif [ -n "${HOME+1}" ] && [ "$HOME" != "/" ]; then
12-
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR=$HOME/jenkins_thirdparty_cache/WorkspaceInstall/$EXECUTOR_NUMBER
13-
else
14-
echo FSL_JENKINS_THIRD_PARTY_INSTALL not configured, using defalt settings for FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR.
15-
fi
16-
fi
17-
18-
if [ ! -n "${FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR+1}" ]; then
19-
if [ -n "${FSL_JENKINS_THIRD_PARTY_INSTALL+1}" ]; then
20-
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR=$FSL_JENKINS_THIRD_PARTY_INSTALL/SharedReadonlyCache
21-
else
22-
echo FSL_JENKINS_THIRD_PARTY_INSTALL not configured, using defalt settings for FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR.
23-
fi
24-
fi
25-
26-
echo - FSL_JENKINS_THIRD_PARTY_INSTALL as $FSL_JENKINS_THIRD_PARTY_INSTALL
27-
echo - FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR as $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR
28-
echo - FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR as $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR
29-
30-
# Start building
31-
export FSL_GRAPHICS_SDK=$WORKSPACE
32-
33-
echo Ensuring dirs exist
34-
mkdir -p $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR
35-
mkdir -p $WORKSPACE/build
36-
37-
echo Setting up the demoframework
38-
39-
source prepare.sh
40-
41-
42-
# Since a specific executor can run build multiple version of the %JOB_NAME% and there is no way
43-
# to get information about that to create a unique directory name based on 'JOB_NAME' 'EXECUTOR_NUMBER' and this 'magic workspace #'
44-
# we force claim the install area instead bypassing a security check
45-
echo Claiming install area begin
46-
FslBuildExternal.py --noGitHash --ForceClaimInstallArea --VoidBuild
47-
echo Claiming install area end
3+
source $WORKSPACE/.Config/Jenkins/yocto/PrepareJenkinsEnvironmentBase.sh
484

495
if [ ! -n "${FSL_CI_FEATURES+1}" ]; then
506
# all
51-
# export FSL_CI_FEATURES=[Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenGLES3.2,OpenVG,OpenVX1.2,Vulkan1.2]
7+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenGLES3.2,OpenVG,OpenVX1.2,Vulkan1.2]
8+
# No GLES3.2
9+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
5210
# No GLES3.2
53-
#export FSL_CI_FEATURES=[Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
54-
# No GLES3.2,Lib_NlohmannJson
5511
export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
5612
fi

‎.Config/Jenkins/yocto/PrepareJenkinsEnvironmentBase.sh‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/bin/bash
2+
3+
# Build recipe caching setup
4+
localJobName=$JOB_NAME
5+
localJobName+='_'
6+
localJobName+=$EXECUTOR_NUMBER
7+
8+
if [ ! -n "${FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR+1}" ]; then
9+
if [ -n "${FSL_JENKINS_THIRD_PARTY_INSTALL+1}" ]; then
10+
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR=$FSL_JENKINS_THIRD_PARTY_INSTALL/WorkspaceInstall/$EXECUTOR_NUMBER
11+
elif [ -n "${HOME+1}" ] && [ "$HOME" != "/" ]; then
12+
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR=$HOME/jenkins_thirdparty_cache/WorkspaceInstall/$EXECUTOR_NUMBER
13+
else
14+
echo FSL_JENKINS_THIRD_PARTY_INSTALL not configured, using defalt settings for FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR.
15+
fi
16+
fi
17+
18+
if [ ! -n "${FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR+1}" ]; then
19+
if [ -n "${FSL_JENKINS_THIRD_PARTY_INSTALL+1}" ]; then
20+
export FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR=$FSL_JENKINS_THIRD_PARTY_INSTALL/SharedReadonlyCache
21+
else
22+
echo FSL_JENKINS_THIRD_PARTY_INSTALL not configured, using defalt settings for FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR.
23+
fi
24+
fi
25+
26+
echo - FSL_JENKINS_THIRD_PARTY_INSTALL as $FSL_JENKINS_THIRD_PARTY_INSTALL
27+
echo - FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR as $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR
28+
echo - FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR as $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_READONLY_CACHE_DIR
29+
30+
# Start building
31+
export FSL_GRAPHICS_SDK=$WORKSPACE
32+
33+
echo Ensuring dirs exist
34+
mkdir -p $FSL_GRAPHICS_SDK_THIRD_PARTY_LIBS_DIR
35+
mkdir -p $WORKSPACE/build
36+
37+
echo Setting up the demoframework
38+
39+
source prepare.sh
40+
41+
42+
# Since a specific executor can run build multiple version of the %JOB_NAME% and there is no way
43+
# to get information about that to create a unique directory name based on 'JOB_NAME' 'EXECUTOR_NUMBER' and this 'magic workspace #'
44+
# we force claim the install area instead bypassing a security check
45+
echo Claiming install area begin
46+
FslBuildExternal.py --noGitHash --ForceClaimInstallArea --VoidBuild
47+
echo Claiming install area end

‎.Config/Jenkins/yocto/PrepareJenkinsEnvironmentCanaryGpuArm.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source $WORKSPACE/.Config/Jenkins/yocto/PrepareJenkinsEnvironmentBase.sh
4+
5+
if [ ! -n "${FSL_CI_FEATURES+1}" ]; then
6+
# all
7+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_ARM,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenGLES3.2,OpenVG,OpenVX1.2,Vulkan1.2]
8+
# No GLES3.2
9+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
10+
# No GLES3.2, OpenVG, OpenVX
11+
export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_ARM,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3.1,Vulkan1.2]
12+
fi

‎.Config/Jenkins/yocto/PrepareJenkinsEnvironmentCanaryGpuVivante.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source $WORKSPACE/.Config/Jenkins/yocto/PrepareJenkinsEnvironmentBase.sh
4+
5+
if [ ! -n "${FSL_CI_FEATURES+1}" ]; then
6+
# all
7+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenGLES3.2,OpenVG,OpenVX1.2,Vulkan1.2]
8+
# No GLES3.2
9+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
10+
# No GLES3.2
11+
export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
12+
fi

‎.Config/Jenkins/yocto/PrepareJenkinsEnvironmentCanaryGpuVivanteIMX6.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
source $WORKSPACE/.Config/Jenkins/yocto/PrepareJenkinsEnvironmentBase.sh
4+
5+
if [ ! -n "${FSL_CI_FEATURES+1}" ]; then
6+
# all
7+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenGLES3.2,OpenVG,OpenVX1.2,Vulkan1.2]
8+
# No GLES3.2
9+
# export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,Lib_NlohmannJson,Lib_pugixml,OpenCL1.2,OpenCV4,OpenGLES2,OpenGLES3,OpenGLES3.1,OpenVG,OpenVX1.2,Vulkan1.2]
10+
# No GLES3.2, OpenCl, OpenCV4
11+
export FSL_CI_FEATURES=[ConsoleHost,WindowHost,Test_RequireUserInputToExit,EarlyAccess,EGL,G2D,GoogleUnitTest,HW_CAMERA_MIPI8X,HW_GPU_VIVANTE,Lib_NlohmannJson,Lib_pugixml,OpenGLES2,OpenGLES3.1,OpenVG]
12+
fi

0 commit comments

Comments
 (0)