Skip to content

Commit

Permalink
Release 5.7.0
Browse files Browse the repository at this point in the history
* Python 3.6 or better is now required
* Updated all setup guides.
* Windows and Ubuntu now uses cmake find_package to locate the system OpenCL implementation.
  This removes the the dependency on the deprecated AMD App SDK.
* Samples:
  * New Vulkan sample: Vulkan.GenerateMipMaps
  * New Vulkan sample: Vulkan.ShaderClock sample (VK_KHR_shader_clock)
  * Vulkan samples updated to utilize the new mipmap generation code.
* Build tools:
  * FslBuildCheck.py clang tidy now defaults to use cmake for dependencies. Legacy mode can still be used by adding ```--legacy```.
  * FslBuild on windows now defaults to the cmake visual studio generator.
  * FslBuild now support package flavors.
  * **Breaking change** FslBuild removed support for dynamic variants.
  * **Breaking change** FslBuild custom Visual Studio project generator no longer use dynamic variants for the OpenGL ES and OpenVG emulation. This means we no longer generate a the ```.StartProject.bat``` file. The user is now responsible calling ```ConfigureOpenGLESEmu.bat```   to configure the OpenGL ES emulator before launching the project.. Its recommended to call this right after the prepare.bat file.
* Dependencies:
  * Upgraded FMT to 7.1.
  * Upgraded GLM to 0.9.9
  * Upgraded GLI to master branch snapshot (0c171ee87fcfe35a7e0e0445adef06f92e0b6a91)
  * Upgraded RapidVulkan to 1.2.162
  • Loading branch information
ReneThrane committed Jan 27, 2021
1 parent df9afd8 commit 9dd46a4
Show file tree
Hide file tree
Showing 1,856 changed files with 22,765 additions and 18,269 deletions.
12 changes: 6 additions & 6 deletions .Config/Configure/ConfigureOpenGLES_Angle.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ set FSL_GLES_EMULATOR_PATH=%ANGLE_RELEASE%
goto start

:START
set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\include
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\lib\Release
set FSL_GLES_LIB_EGL=libEGL.dll.lib
set FSL_GLES_LIB_GLES=libGLESv2.dll.lib
set FSL_GLES_NAME=Angle
set PATH=%FSL_GLES_LIB_PATH%;%PATH%
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\include
set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\lib\Release
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.dll.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.dll.lib
set FSL_GLES_EMULATOR_NAME=Angle
set PATH=%FSL_GLES_EMULATOR_LIB_PATH%;%PATH%
12 changes: 6 additions & 6 deletions .Config/Configure/ConfigureOpenGLES_Arm.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ set FSL_GLES_EMULATOR_PATH=c:\Program Files\ARM\Mali Developer Tools\Mali OpenGL
goto start

:START
set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\include
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_PATH%
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=ARM
set PATH=%FSL_GLES_LIB_PATH%;%PATH%
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\include
set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_PATH%
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=ARM
set PATH=%FSL_GLES_EMULATOR_LIB_PATH%;%PATH%
14 changes: 7 additions & 7 deletions .Config/Configure/ConfigureOpenGLES_PowerVR.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@echo off
set FSL_GLES_EMULATOR_PATH=c:\Imagination\PowerVR_Graphics
set FSL_GLES_EMULATOR_SDK_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_SDK\SDK_2017_R1
set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Windows\x86_64\Lib
set FSL_GLES_DLL_PATH=%FSL_GLES_LIB_PATH%
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=PowerVR
set PATH=%FSL_GLES_DLL_PATH%;%PATH%
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Windows\x86_64\Lib
set FSL_GLES_EMULATOR_DLL_PATH=%FSL_GLES_EMULATOR_LIB_PATH%
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=PowerVR
set PATH=%FSL_GLES_EMULATOR_DLL_PATH%;%PATH%
14 changes: 7 additions & 7 deletions .Config/Configure/ConfigureOpenGLES_PowerVR_Frame.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ set FSL_GLES_EMULATOR_PATH=c:\Imagination\PowerVR_Graphics
set FSL_GLES_EMULATOR_SDK_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_SDK\SDK_2017_R1
set FSL_GLES_EMULATOR_TOOL_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_Tools

set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRVFrame\Library\Windows_x86_64
set FSL_GLES_DLL_PATH=%FSL_GLES_LIB_PATH%
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=PowerVR_Frame
set PATH=%FSL_GLES_DLL_PATH%;%PATH%
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
m set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRVFrame\Library\Windows_x86_64
set FSL_GLES_EMULATOR_DLL_PATH=%FSL_GLES_EMULATOR_LIB_PATH%
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=PowerVR_Frame
set PATH=%FSL_GLES_EMULATOR_DLL_PATH%;%PATH%
14 changes: 7 additions & 7 deletions .Config/Configure/ConfigureOpenGLES_PowerVR_Trace.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ set FSL_GLES_EMULATOR_PATH=c:\Imagination\PowerVR_Graphics
set FSL_GLES_EMULATOR_SDK_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_SDK\SDK_2017_R1
set FSL_GLES_EMULATOR_TOOL_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_Tools

set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_Tools\PVRVFrame\Library\Windows_x86_64
set FSL_GLES_DLL_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRTrace\Recorder\Windows_x86_64
set FSL_GLES_DLL_ORG_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRTrace\Recorder\Windows_x86_64
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=PowerVR_Trace
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_SDK_PATH%\Builds\Include
rem set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\PowerVR_Tools\PVRVFrame\Library\Windows_x86_64
set FSL_GLES_EMULATOR_DLL_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRTrace\Recorder\Windows_x86_64
rem set FSL_GLES_EMULATOR_DLL_ORG_PATH=%FSL_GLES_EMULATOR_TOOL_PATH%\PVRTrace\Recorder\Windows_x86_64
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=PowerVR_Trace
set PATH=%FSL_GLES_DLL_PATH%;%PATH%
14 changes: 7 additions & 7 deletions .Config/Configure/ConfigureOpenGLES_Qualcomm.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@echo off
set FSL_GLES_EMULATOR_PATH=c:\AdrenoSDK
set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\Development\Inc
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\Development\Lib\x64
set FSL_GLES_BIN_PATH=%FSL_GLES_EMULATOR_PATH%\Bin
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=Qualcomm
set PATH=%FSL_GLES_BIN_PATH%;FSL_GLES_BIN_PATH\x64;%PATH%
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\Development\Inc
rem set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\Development\Lib\x64
set FSL_GLES_EMULATOR_BIN_PATH=%FSL_GLES_EMULATOR_PATH%\Bin
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=Qualcomm
set PATH=%FSL_GLES_EMULATOR_BIN_PATH%;FSL_GLES_BIN_PATH\x64;%PATH%
10 changes: 5 additions & 5 deletions .Config/Configure/ConfigureOpenGLES_Vivante.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ goto start

:START
set PATH=%FSL_GLES_EMULATOR_PATH%\bin;%PATH%
set FSL_GLES_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\inc
set FSL_GLES_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\lib
set FSL_GLES_LIB_EGL=libEGL.lib
set FSL_GLES_LIB_GLES=libGLESv2.lib
set FSL_GLES_NAME=VIVANTE
rem set FSL_GLES_EMULATOR_INCLUDE_PATH=%FSL_GLES_EMULATOR_PATH%\inc
rem set FSL_GLES_EMULATOR_LIB_PATH=%FSL_GLES_EMULATOR_PATH%\lib
rem set FSL_GLES_EMULATOR_LIB_EGL=libEGL.lib
rem set FSL_GLES_EMULATOR_LIB_GLES=libGLESv2.lib
set FSL_GLES_EMULATOR_NAME=VIVANTE
13 changes: 0 additions & 13 deletions .Config/Configure/ConfigureOpenVG_Reference.bat

This file was deleted.

3 changes: 0 additions & 3 deletions .Config/ConfigureEGL.bat

This file was deleted.

1 change: 0 additions & 1 deletion .Config/ConfigureG2D.bat

This file was deleted.

1 change: 0 additions & 1 deletion .Config/ConfigureOpenCL.bat

This file was deleted.

3 changes: 0 additions & 3 deletions .Config/ConfigureOpenGLES2.bat

This file was deleted.

3 changes: 0 additions & 3 deletions .Config/ConfigureOpenGLES3.bat

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ if /i %1==vivante goto BACKEND_VIVANTE
goto EXIT

:EXIT
echo OpenGL ES emulation: %FSL_GLES_EMULATOR_PATH%
13 changes: 0 additions & 13 deletions .Config/ConfigureOpenVG.bat

This file was deleted.

1 change: 0 additions & 1 deletion .Config/ConfigureOpenVX.bat

This file was deleted.

1 change: 0 additions & 1 deletion .Config/ConfigureVulkan.bat

This file was deleted.

12 changes: 6 additions & 6 deletions .Config/FslBuildGen/Build/BuildConfigRecord.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
from typing import Dict
from typing import List
from typing import Optional
from typing import Union
#from typing import Union
from FslBuildGen.Build.BuildVariantConfigUtil import BuildVariantConfigUtil
from FslBuildGen.Build.DataTypes import CommandType
from FslBuildGen.DataTypes import BuildVariantConfig
from FslBuildGen.ExtensionListManager import ExtensionListManager
#from FslBuildGen.DataTypes import BuildVariantConfig
#from FslBuildGen.ExtensionListManager import ExtensionListManager
from FslBuildGen.Generator.GeneratorPluginBase2 import GeneratorPluginBase2
from FslBuildGen.Version import Version
from FslBuildGen.PackageFilters import PackageFilters
from FslBuildGen.QualifiedRequirementExtensionName import QualifiedRequirementExtensionName
from FslBuildGen.SharedGeneration import ToolAddedVariant
#from FslBuildGen.PackageFilters import PackageFilters
#from FslBuildGen.QualifiedRequirementExtensionName import QualifiedRequirementExtensionName
#from FslBuildGen.SharedGeneration import ToolAddedVariant


class BuildConfigRecord(object):
Expand Down
8 changes: 4 additions & 4 deletions .Config/FslBuildGen/Build/BuildConfigureCache.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
class BuildConfigureCache(object):
CURRENT_VERSION = 4

def __init__(self, fileHashDict: Dict[str,str], commandList: List[str], platformName: str, fslBuildVersion: str, allowFindPackage: str) -> None:
def __init__(self, fileHashDict: Dict[str, str], commandList: List[str], platformName: str, fslBuildVersion: str, allowFindPackage: str) -> None:
super().__init__()
self.Version = BuildConfigureCache.CURRENT_VERSION
self.FileHashDict = fileHashDict
self.CommandList = commandList
self.PlatformName = platformName;
self.PlatformName = platformName
self.FslBuildVersion = fslBuildVersion
self.AllowFindPackage = allowFindPackage

Expand Down Expand Up @@ -84,7 +84,7 @@ def TryLoad(log: Log, cacheFilename: str) -> Optional['BuildConfigureCache']:

@staticmethod
def Save(log: Log, cacheFilename: str, buildConfigureCache: 'BuildConfigureCache') -> None:
log.LogPrintVerbose(4, "- Saving generated file hash cache")
log.LogPrintVerbose(4, "- Saving generated file hash cache '{0}'".format(cacheFilename))
jsonText = json.dumps(buildConfigureCache.__dict__, ensure_ascii=False, sort_keys=True, indent=2)
IOUtil.WriteFileIfChanged(cacheFilename, jsonText)

Expand All @@ -101,4 +101,4 @@ def IsEqual(lhs: 'BuildConfigureCache', rhs: 'BuildConfigureCache') -> bool:
if value != rhs.CommandList[index]:
return False

return lhs.PlatformName == rhs.PlatformName
return lhs.PlatformName == rhs.PlatformName
10 changes: 5 additions & 5 deletions .Config/FslBuildGen/Build/BuildUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ def TryAddBuildThreads(log: Log, rArgumentList: List[str], generatorOriginalName
# This is the old add thread arguments code from a simpler time when we only supported one build system per platform
platformName = generatorOriginalName
if (platformName == PlatformNameString.QNX or
platformName == PlatformNameString.YOCTO or
platformName == PlatformNameString.UBUNTU or
platformName == PlatformNameString.FREERTOS or
(external and platformName == PlatformNameString.ANDROID)):
platformName == PlatformNameString.YOCTO or
platformName == PlatformNameString.UBUNTU or
platformName == PlatformNameString.FREERTOS or
(external and platformName == PlatformNameString.ANDROID)):
PlatformBuildUtil.AddMakeThreadArgument(rArgumentList, numBuildThreads)
return True
elif platformName == PlatformNameString.WINDOWS:
Expand All @@ -86,7 +86,7 @@ def TryAddBuildThreads(log: Log, rArgumentList: List[str], generatorOriginalName
return PlatformBuildUtil.TryAddCMakeThreadArgument(rArgumentList, numBuildThreads, cmakeConfig)
elif buildTypeInfo == PlatformBuildTypeInfo.CMakeCustom:
return PlatformBuildUtil.TryAddCustomCMakeThreadArgument(rArgumentList, numBuildThreads, cmakeConfig)
log.DoPrintWarning("Unknown build type info {0}".format(buildTypeInfo));
log.DoPrintWarning("Unknown build type info {0}".format(buildTypeInfo))
return False

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions .Config/FslBuildGen/Build/BuildVariantConfigUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#****************************************************************************************************************************************************

from typing import Dict
from typing import List
from typing import Optional
#from typing import List
#from typing import Optional
from FslBuildGen.DataTypes import BuildVariantConfig
from FslBuildGen.DataTypes import BuildVariantConfigDefaults
from FslBuildGen.SharedGeneration import ToolAddedVariant
Expand Down
6 changes: 3 additions & 3 deletions .Config/FslBuildGen/Build/BuildVariantUtil.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#****************************************************************************************************************************************************

from typing import Dict
from typing import List
#from typing import List
from typing import Optional
from FslBuildGen.Build.CaptureEnvironmentVariablesFromScript import CaptureEnvironmentVariablesFromScript
#from FslBuildGen.Build.CaptureEnvironmentVariablesFromScript import CaptureEnvironmentVariablesFromScript
from FslBuildGen.DataTypes import VariantType
from FslBuildGen.Log import Log
from FslBuildGen.Packages.Package import Package
Expand Down Expand Up @@ -123,7 +123,7 @@ def ExtendEnvironmentDictWithVariants(log: Log,

@staticmethod
def CreateCompleteStaticVariantSettings(resolvedAllVariantDict: Dict[str, PackagePlatformVariant],
variantsSelectionDict: Dict[str, str]) -> Dict[str,str]:
variantsSelectionDict: Dict[str, str]) -> Dict[str, str]:
"""
Create a settings dict variant options in the resolvedAllVariantDict.
We will use the supplied settings from variantsSelectionDict when available and chose a default option when not.
Expand Down
Loading

0 comments on commit 9dd46a4

Please sign in to comment.