Skip to content

Commit

Permalink
PowerVR Graphics SDK v5.12 Release.
Browse files Browse the repository at this point in the history
SDK 24.1(v5.12) release.

Native SDK:
* Changes in CMake to speed up Android builds. Downgraded CMake to v3.10 and Gradle to v3.5.3. NDK 20.0.5594570 is a valid version when cross compiling for Android from Windows / Linux.
* Added new Vulkan example: Antialiasing (MSAA, FXAA, TAA).
* Fixed VulkanTimelineSemaphores example crashing on early exit when the extension is not supported.
* Fixed VulkanSubgroups example no ouput on BXM-8-256: Workgroup width was being set to zero during setup.
* Fixed OpenGLESPostProcessing and VulkanPostProcessing small artifacts on the edge of the mesh when no post processing method is being applied.
* Fix: Making several SDK demos time deterministic when using the -forceframetime parameter (OpenGLESDeferredShading, OpenGLESGameOfLife, OpenGLESParticleSystem, VulkanDeferredShading, VulkanDeferredShadingPFX, VulkanGameOfLife, VulkanGnomeHorde, ParticleSystemGPU).
* Fixed VulkanHelloRayTracing various buffers being built with not optimal memory properties.
* Fixed PVRVk getCacheMaxDataSize(), initializing dataSize parameter handed to vkGetPipelineCacheData to identify cases where pipeline cached data has size 0.
* Fixed over 170 compilation warnings.

PVRVFrame:
* Fix the OpenGL ES 2+ implementation of 'glBlendEquation' to correctly handle the advanced blend equation modes.
* Fix libGLESv2.so dynamic loading error symbol lookup error: undefined symbol which prevented successful loading of libGLESv2.so in some code paths.
* Add support for GL_EXT_sparse_texture on platforms that support GL_ARB_sparse_texture.
* Add support for GL_EXT_clip_control on platforms that support GL_ARB_clip_control or OpenGL 4.5.
* Fix glAttachShader so it returns GL_INVALID_OPERATION if a shader is passed in of a type that is already attached to the target program.
* Fix glReadPixels reading from framebuffers that make use of glFramebufferTexture2DMultisampleEXT|IMG.

The documentation from this repository has been moved to https://docs.imgtec.com/

Refer to our release notes for more details about the changes: https://developer.imaginationtech.com/tools/release-notes/
  • Loading branch information
AlejandroCosin committed Mar 22, 2024
1 parent b2a77e7 commit 6e7a32d
Show file tree
Hide file tree
Showing 280 changed files with 4,321 additions and 955 deletions.
4 changes: 2 additions & 2 deletions BUILD.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ Android Setup
1. Download and install the Android SDK or command-line only Android build tools
2. Through the Android SDK Manager, either via Android Studio or command-line SDK manager, install the following packages:

- Android NDK bundle
- Android NDK bundle, recommended version 20.0.5594570
- The Android SDK Platform package for API level 29 (used as our targetSdkVersion)
- The Android SDK Build-Tools version 29 (used as our compileSdkVersion)
- CMake version 3.18.0
- CMake version 3.10.2
- LLDB [optional] - only required for on-device debugging
- If you plan on using gradleW from the command-line, make sure that the environment variable ``JavaHome`` points to a valid Java JDK directory

Expand Down
119 changes: 71 additions & 48 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,72 +1,95 @@
cmake_minimum_required(VERSION 3.18.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10)
project(PowerVR_SDK)

# Ensure we are not building for apple targets
if(APPLE OR IOS)
message(FATAL_ERROR "Sorry, the PowerVR SDK is no longer supported on Apple devices")
endif()
include(GNUInstallDirs)

# Avoids the SDK target being added multiple times
if(TARGET PowerVR_SDK)
return()
endif()
option(PVR_BUILD_FRAMEWORK "Build the PowerVR Framework" ON)
option(PVR_PREBUILT_DEPENDENCIES "Indicates that the PowerVR Framework and its dependencies have been prebuilt. Libraries will not be built and will instead be imported. The Examples will still be built" OFF)

# Provides install directory variables to GNU standards
include(GNUInstallDirs)
# Compile definitions, options that can be set others
include("${CMAKE_CURRENT_LIST_DIR}/Configuration.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/framework/FrameworkCommon.cmake")

# Store the root directory of the SDK framework, so configurable files can be found
set(SDK_ROOT_INTERNAL_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE INTERNAL "Path to the root of the SDK")
####################################################
include(${CMAKE_CURRENT_LIST_DIR}/cmake/utilities/executable.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cmake/utilities/assets.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/cmake/utilities/spirv.cmake)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
####################################################

# Make a top-level project file to build everything
add_library(PowerVR_SDK INTERFACE)
# Avoids the SDK being added multiple times
if(TARGET PowerVR_SDK)
return()
endif()

# Set default vakues for the options used by the SDK
# These options configure which parts of the framework are built
option(PVR_BUILD_FRAMEWORK_VULKAN "Build the Vulkan part of the framework" ON)
option(PVR_BUILD_FRAMEWORK_GLES "Build the GLES part of the framework" ON)
option(PVR_BUILD_FRAMEWORK_GLSC "Build the GLSC part of the framework" ON)
option(PVR_BUILD_FRAMEWORK_OPENCL "Build the OpenCL part of the framework" ON)
option(PVR_BUILD_VULKAN_EXAMPLES "Build the Vulkan examples" ON)
option(PVR_BUILD_OPENGLES_EXAMPLES "Build the GLES examples" ON)
option(PVR_BUILD_OPENCL_EXAMPLES "Build the OpenCL examples" ON)

# If this cmake file isn't the top level one, then the SDK is being used in another project
# And we can assume the user doesn't want to build the examples
get_directory_property(HAS_PARENT PARENT_DIRECTORY)
if(HAS_PARENT)
option(PVR_BUILD_EXAMPLES "Build the PowerVR SDK Examples" OFF)
else()
option(PVR_BUILD_EXAMPLES "Build the PowerVR SDK Examples" ON)
endif()

# Ensure that if the user wants to build the examples for a specific API
# Then the corrosponding part of the framework would also be built
if(PVR_BUILD_EXAMPLES)
if(PVR_BUILD_VULKAN_EXAMPLES)
option(PVR_BUILD_FRAMEWORK_VULKAN "Build the Vulkan part of the framework" ON)
endif()
# Make a top-level project file to build everything
add_library(PowerVR_SDK INTERFACE)

if(PVR_BUILD_OPENGLES_EXAMPLES)
option(PVR_BUILD_FRAMEWORK_GLES "Build the GLES part of the framework" ON)
endif()
# Default to release if the user passes nothing.
if(NOT CMAKE_BUILD_TYPE)
message("-DCMAKE_BUILD_TYPE not defined. Assuming Release")
set(CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "CMAKE_BUILD_TYPE - Specifies the build type on single-configuration generators")
endif()

if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/install/${INSTALL_SUFFIX} CACHE INTERNAL "")
# Ensure other projects don't set CMAKE_INSTALL_PREFIX
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
endif()

# Tell CMake where to find the SDK's cmake modules, ie when cmake calls find_package(*)
# cmake needs to know where the SDK's custom scripts for this process are located
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
set(GLSLANG_VALIDATOR_INSTALL_DIR "GLSLANG_VALIDATOR-NOTFOUND" CACHE PATH "Path to a prebuilt glslangValidator")

if(NOT GLSLANG_VALIDATOR_INSTALL_DIR)
set(GLSLANG_VALIDATOR_INSTALL_DIR $ENV{GLSLANG_VALIDATOR_INSTALL_DIR})
endif()

option(PVR_SKIP_INSTALL "Skip installation of the PowerVR SDK" ${PVR_SKIP_INSTALL})
if(NOT ${PVR_SKIP_INSTALL})
set(PVR_ENABLE_INSTALL ON)
endif()

# Now we need to add in the CMake utilities, they're cmake files that provide helper functions
include(cmake/utilities/assets.cmake) # Provides add_assets_to_target
include(cmake/utilities/executable.cmake) # Provides add_platform_specific_executable
include(cmake/utilities/spirv.cmake) # Provides add_spirv_shaders_to_target
add_subdirectory(external EXCLUDE_FROM_ALL)

# Add the framework source tree
add_subdirectory(framework)
if(NOT PVR_PREBUILT_DEPENDENCIES)
add_subdirectory(framework EXCLUDE_FROM_ALL)
endif()

# If the user has the examples option, then also add the examples source tree
if(PVR_BUILD_EXAMPLES)
option(PVR_BUILD_OPENGLES_EXAMPLES "Build the OpenGLES PowerVR SDK Examples - PVR_BUILD_EXAMPLES must also be enabled" OFF)
option(PVR_BUILD_VULKAN_EXAMPLES "Build the Vulkan PowerVR SDK Examples - PVR_BUILD_EXAMPLES must also be enabled" OFF)
option(PVR_BUILD_OPENCL_EXAMPLES "Build the OpenCL PowerVR SDK Examples - PVR_BUILD_EXAMPLES must also be enabled" OFF)
option(PVR_BUILD_OPENGLES2_EXAMPLES "Only build OpenGL ES 2.0 examples - PVR_BUILD_EXAMPLES must also be enabled. Assumes PVR_BUILD_OPENGLES_EXAMPLES to ON and disables Non-OpenGL ES examples as well." OFF)

if (PVR_BUILD_OPENGLES2_EXAMPLES)
set(PVR_BUILD_OPENGLES_EXAMPLES ON)
endif()

if(NOT PVR_BUILD_OPENGLES_EXAMPLES AND NOT PVR_BUILD_VULKAN_EXAMPLES AND NOT PVR_BUILD_OPENCL_EXAMPLES)
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/examples/OpenGLES/CMakeLists.txt)
set(PVR_BUILD_OPENGLES_EXAMPLES 1)
endif()
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/examples/Vulkan/CMakeLists.txt)
set(PVR_BUILD_VULKAN_EXAMPLES 1)
endif()
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/examples/OpenCL/CMakeLists.txt)
set(PVR_BUILD_OPENCL_EXAMPLES 1)
endif()
endif()

add_subdirectory(examples)
endif()

# Add in the PVR Scope Developer external target.
add_subdirectory(external/PVRScope)
get_property(ALL_EXTERNAL_TARGETS GLOBAL PROPERTY PVR_EXTERNAL_TARGETS)
get_property(ALL_FRAMEWORK_TARGETS GLOBAL PROPERTY PVR_FRAMEWORK_TARGETS)
get_property(ALL_EXAMPLE_TARGETS GLOBAL PROPERTY PVR_EXAMPLE_TARGETS)

foreach(TARGET_NAME ${ALL_EXTERNAL_TARGETS} ${ALL_FRAMEWORK_TARGETS} ${ALL_EXAMPLE_TARGETS})
enable_sdk_options_for_target(${TARGET_NAME})
endforeach()
5 changes: 3 additions & 2 deletions Configuration.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.18)
cmake_minimum_required(VERSION 3.10)

# EVERYTHING IN THIS FILE IS BASICALLY OPTIONAL. It is our recommended compiler configuration and some tools. This is applied to all targets via the "enable_sdk_options_for_target"

include(CheckCXXCompilerFlag)

# Options that can be set
option(PVR_ENABLE_FAST_MATH "If enabled, attempt to enable fast-math." ON)

Expand Down Expand Up @@ -70,6 +72,5 @@ function(enable_sdk_options_for_target THETARGET)
endif()
endif()
endif()

endif()
endfunction()
33 changes: 17 additions & 16 deletions build-android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ ext.PVR_OPENGLES_EXAMPLES = [
'AntiAliasing',
'MultiviewVR',
'PostProcessing',
'OpenCLExample',
'Skinning',
'ParticleSystem',
'GaussianBlur',
Expand All @@ -39,30 +38,32 @@ ext.PVR_VULKAN_EXAMPLES = [
'03_IntroducingPVRVk',
'04_IntroducingPVRUtils',
'05_IntroducingUIRenderer',
'Skinning',
'MultiSampling',
'PostProcessing',
'GnomeHorde',
'GPUControlledRendering',
'ParticleSystem',
'AntiAliasing',
'AmbientOcclusion',
'Bumpmap',
'GaussianBlur',
'Multithreading',
'ExampleUI',
'DeferredShading',
'DeferredShadingPFX',
'ExampleUI',
'GameOfLife',
'GaussianBlur',
'Glass',
'PVRScopeExample',
'PVRScopeRemote',
'GnomeHorde',
'GPUControlledRendering',
'ImageBasedLighting',
'IMGTextureFilterCubic',
'ImageBasedLightingMapGenerator',
'GameOfLife',
'PipelineCache',
'AmbientOcclusion',
'IMGTextureFilterCubic',
'MatrixMultiplication',
'MultiSampling',
'Multithreading',
'ParticleSystem',
'PipelineCache',
'PostProcessing',
'PVRScopeExample',
'PVRScopeRemote',
'Shadows',
'Skinning',
'SPHFluidSimulation',
'Subgroups',
'TimelineSemaphores',
]

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRAssets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRAssets_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRAssets/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRAssets")
set(PVRAssets_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRAssets/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRAssets")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRCamera.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRCamera_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRCamera/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRCamera")
set(PVRCamera_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRCamera/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRCamera")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRCore_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRCore/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRCore")
set(PVRCore_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRCore/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRCore")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRPfx.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRPfx_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRPfx/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRPfx")
set(PVRPfx_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRPfx/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRPfx")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRShell.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRShell_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRShell/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRShell")
set(PVRShell_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRShell/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRShell")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRUtilsCL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRUtilsCL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRUtils/OpenCL/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsCL")
set(PVRUtilsCL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRUtils/OpenCL/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsCL")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRUtilsGles.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRUtilsGles_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRUtils/OpenGLES/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsGles")
set(PVRUtilsGles_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRUtils/OpenGLES/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsGles")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRUtilsVk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ endif()
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRUtilsVk_DIR "${CMAKE_CURRENT_LIST_DIR}/../../PVRUtils/Vulkan/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsVk")
set(PVRUtilsVk_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRUtils/Vulkan/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRUtilsVk")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindPVRVk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(PVRVk_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../framework/PVRVk/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRVk")
set(PVRVk_DIR "${CMAKE_CURRENT_LIST_DIR}/../../framework/PVRVk/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/PVRVk")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindVulkanMemoryAllocator.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(VulkanMemoryAllocator_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/VulkanMemoryAllocator/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}")
set(VulkanMemoryAllocator_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/VulkanMemoryAllocator/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}")
endif()
endif()

Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/Findglm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(glm_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glm/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(glm_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glm/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
endif()
endif()

if(NOT TARGET glm)
find_package(glm REQUIRED CONFIG)
endif()
endif()
18 changes: 9 additions & 9 deletions cmake/modules/Findglslang.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Findglslang.cmake
#
# Finds the glslang, SPIRV, OGLCompiler, OSDependent targets
# Finds the glslang, SPIRV, OGLCompiler, OSDependent, GenericCodeGen, MachineIndependent targets
#
# This will define the following imported targets
# glslang
Expand All @@ -13,14 +13,14 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(glslang_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(SPIRV_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(OGLCompiler_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(OSDependent_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(GenericCodeGen_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(MachineIndependent_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
message("${CMAKE_CURRENT_LIST_DIR}/../../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
endif()
set(glslang_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(SPIRV_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(OGLCompiler_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(OSDependent_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(GenericCodeGen_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(MachineIndependent_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/glslang/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")

endif()
endif()

if(NOT TARGET OGLCompiler)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/Findpugixml.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(pugixml_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/pugixml/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
set(pugixml_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/pugixml/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}/build")
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/Findtinygltf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if(PVR_PREBUILT_DEPENDENCIES)
if(ANDROID)
string(TOLOWER ${CMAKE_BUILD_TYPE} PVR_ANDROID_BUILD_TYPE)
set(tinygltf_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../external/tinygltf/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}")
set(tinygltf_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/tinygltf/build-android/.cxx/cmake/${PVR_ANDROID_BUILD_TYPE}/${ANDROID_ABI}")
endif()
endif()

Expand Down
Loading

0 comments on commit 6e7a32d

Please sign in to comment.