Skip to content

Commit

Permalink
Update xgl from commit: 2f3287e
Browse files Browse the repository at this point in the history
* Implement VK_EXT_post_depth_coverage
* Re-work vkPipelineCache
* Add "enableLoadScalarizer" option to app_shader_optimizer
* Tune shader performance for F1 2017 and the Talos principle
* EXT_vertex_attribute_divisor: Add missing features query and support verification
* Fix a case fallthrough bug with VK_AMD_memory_overallocation_behavior at device creation
* Move platformKey to physical device
* Make InitializePlatformKey() as a void function
* Add ShaderDbg to LLPC
* Bump LLPC client interface version to 34
* Update PAL Interface in Vulkan to 534

Change-Id: I8f6833890aaf717ade2bc04235ed81863f2fbad3
  • Loading branch information
JacobHeAMD committed Sep 29, 2019
1 parent 2cb5558 commit 3252b62
Show file tree
Hide file tree
Showing 36 changed files with 1,134 additions and 1,151 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ set(XGL_PAL_PATH ${PROJECT_SOURCE_DIR}/../pal CACHE PATH "Specify the path to th
set(PAL_CLIENT_INTERFACE_MAJOR_VERSION ${ICD_PAL_CLIENT_MAJOR_VERSION} CACHE STRING "${PROJECT_NAME} override." FORCE)
set(PAL_CLIENT "VULKAN" CACHE STRING "${PROJECT_NAME} override." FORCE)

set(PAL_DEVELOPER_BUILD ${VK_INTERNAL_DEVELOPER} CACHE BOOL "${PROJECT_NAME} override." FORCE)
if(ICD_BUILD_SPVONLY)
set(PAL_ENABLE_PRINTS_ASSERTS ON CACHE BOOL "${PROJECT_NAME} override." FORCE)
endif()
Expand Down
10 changes: 4 additions & 6 deletions icd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,10 @@ if(ICD_MEMTRACK)
endif()

# Configure Vulkan SDK version definitions
if(USE_NEXT_SDK)
target_compile_definitions(xgl PRIVATE VKI_SDK_1_2=1)
else()
target_compile_definitions(xgl PRIVATE VKI_SDK_1_1=1)
endif()

set(SDK VKI_SDK_1_1)

target_compile_definitions(xgl PRIVATE ${SDK}=1)

# Enable relevant GPUOpen preprocessor definitions
if(ICD_GPUOPEN_DEVMODE_BUILD)
Expand Down Expand Up @@ -183,7 +182,6 @@ target_sources(xgl PRIVATE
api/barrier_policy.cpp
api/color_space_helper.cpp
api/compiler_solution.cpp
api/gpu_event_mgr.cpp
api/internal_mem_mgr.cpp
api/pipeline_compiler.cpp
api/pipeline_binary_cache.cpp
Expand Down
199 changes: 199 additions & 0 deletions icd/api/app_shader_optimizer.cpp

Large diffs are not rendered by default.

47 changes: 5 additions & 42 deletions icd/api/compiler_solution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,49 +49,12 @@ CompilerSolution::~CompilerSolution()

// =====================================================================================================================
// Initialize CompilerSolution class
VkResult CompilerSolution::Initialize()
VkResult CompilerSolution::Initialize(
Llpc::GfxIpVersion gfxIp,
Pal::GfxIpLevel gfxIpLevel)
{
Pal::IDevice* pPalDevice = m_pPhysicalDevice->PalDevice();
const RuntimeSettings& settings = m_pPhysicalDevice->GetRuntimeSettings();

// Initialize GfxIp informations per PAL device properties
Pal::DeviceProperties info;
pPalDevice->GetProperties(&info);

switch (info.gfxLevel)
{
case Pal::GfxIpLevel::GfxIp6:
m_gfxIp.major = 6;
m_gfxIp.minor = 0;
break;
case Pal::GfxIpLevel::GfxIp7:
m_gfxIp.major = 7;
m_gfxIp.minor = 0;
break;
case Pal::GfxIpLevel::GfxIp8:
m_gfxIp.major = 8;
m_gfxIp.minor = 0;
break;
case Pal::GfxIpLevel::GfxIp8_1:
m_gfxIp.major = 8;
m_gfxIp.minor = 1;
break;
case Pal::GfxIpLevel::GfxIp9:
m_gfxIp.major = 9;
m_gfxIp.minor = 0;
break;
case Pal::GfxIpLevel::GfxIp10_1:
m_gfxIp.major = 10;
m_gfxIp.minor = 1;
break;

default:
VK_NEVER_CALLED();
break;
}

m_gfxIp.stepping = info.gfxStepping;
m_gfxIpLevel = info.gfxLevel;
m_gfxIp = gfxIp;
m_gfxIpLevel = gfxIpLevel;

return VK_SUCCESS;
}
Expand Down
6 changes: 4 additions & 2 deletions icd/api/compiler_solution_llpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ CompilerSolutionLlpc::~CompilerSolutionLlpc()

// =====================================================================================================================
// Initialize CompilerSolutionLlpc class
VkResult CompilerSolutionLlpc::Initialize()
VkResult CompilerSolutionLlpc::Initialize(
Llpc::GfxIpVersion gfxIp,
Pal::GfxIpLevel gfxIpLevel)
{
VkResult result = CompilerSolution::Initialize();
VkResult result = CompilerSolution::Initialize(gfxIp, gfxIpLevel);

if (result == VK_SUCCESS)
{
Expand Down
Loading

0 comments on commit 3252b62

Please sign in to comment.