From 6a2fc411098a19fd19cf0a00b96ccba24e01f031 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 8 Jul 2016 17:30:00 -0400 Subject: [PATCH] P4 to Git Change 1289323 by ashi1@ashi1_win50 on 2016/07/08 16:35:14 SWDEV-97770 - Workaround to get OCL to build after Pele and Evergreen files are removed from ugl. "drivers/ugl/src/gl/gs/hwl/evergreen" and " "drivers/ugl/src/gl/gs/hwl/pele" no longer exist. This moves the dependency to "drivers/inc/asic_reg/3D/r800" and "drivers/inc/asic_reg/3D/r600". Not the ideal solution but better than build failure. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/complibdefs#6 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#49 edit [ROCm/clr commit: 9b5d65ddf51693a27185503843e9cfb0981432c8] --- projects/clr/rocclr/compiler/lib/complibdefs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/complibdefs b/projects/clr/rocclr/compiler/lib/complibdefs index d234807591..c7ab369879 100644 --- a/projects/clr/rocclr/compiler/lib/complibdefs +++ b/projects/clr/rocclr/compiler/lib/complibdefs @@ -67,8 +67,8 @@ GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_ERROR=0" GCPPFLAGS += $(DEFSWITCH) "LOG_LEVEL=2" GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/rt" -GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/pele/include/asic" -GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/evergreen/include/asic" +GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg/3D/r600" +GCPPFLAGS += $(INCSWITCH) "$(DEPTH)/drivers/inc/asic_reg/3D/r800" GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/si/include/asic" export BRIG_ENABLE=1