From fd765d878b646c4ed63dbcee4593da2578f35028 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 11 Jul 2016 17:23:44 -0400 Subject: [PATCH] P4 to Git Change 1290046 by ashi1@ashi1_win50 on 2016/07/11 17:09:49 SWDEV-95135 - Fix OpenCL build after removing legacy asics from OpenGL. This is a minimal change to fix the build. Some more code could be removed because the expression (asic_id < GSL_ATIASIC_ID_TAHITI_P) should never be true, since GSL_ATIASIC_ID_TAHITI_P is the minimum asic id. ReviewBoardURL = http://ocltc.amd.com/reviews/r/10808/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#169 edit --- rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index 40c6d1a4a7..711135c9f0 100644 --- a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -323,9 +323,7 @@ CALGSLDevice::SetupAdapter(int32 &asic_id) asic_id = m_adp->getAsicID(); - if ((asic_id < GSL_ATIASIC_ID_TAHITI_P) || - (asic_id == GSL_ATIASIC_ID_DEVASTATOR) || - (asic_id == GSL_ATIASIC_ID_SCRAPPER)) + if ((asic_id < GSL_ATIASIC_ID_TAHITI_P)) { LogPrintfInfo("Unsupported legacy ASIC(%d) found!\n", asic_id); // close the adaptor @@ -362,9 +360,7 @@ CALGSLDevice::SetupAdapter(int32 &asic_id) m_isSDMAL2TConstrained = false; } - if (asic_id < GSL_ATIASIC_ID_TAHITI_P || - asic_id == GSL_ATIASIC_ID_DEVASTATOR || - asic_id == GSL_ATIASIC_ID_SCRAPPER) + if (asic_id < GSL_ATIASIC_ID_TAHITI_P) { m_computeRing = false; }