From 0e5ef747e647b8a8cfa4a6e28a344989d23b6f40 Mon Sep 17 00:00:00 2001
From: Aaron Enye Shi <enye.shi@gmail.com>
Date: Thu, 5 Jul 2018 20:49:47 +0000
Subject: [PATCH] Enable surface functions on HIP clang path

Fix surface test on HIP clang path.


[ROCm/clr commit: 5862ae4b6a8623d6e3eed272238b96d6a848499e]
---
 projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h       | 2 +-
 projects/clr/hipamd/include/hip/hcc_detail/surface_functions.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h
index 48818fb15d..267f970377 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime.h
@@ -110,9 +110,9 @@ extern int HIP_TRACE_API;
 #include <hip/hcc_detail/host_defines.h>
 #include <hip/hcc_detail/math_functions.h>
 #include <hip/hcc_detail/device_functions.h>
+#include <hip/hcc_detail/surface_functions.h>
 #if __HCC__
 #include <hip/hcc_detail/texture_functions.h>
-#include <hip/hcc_detail/surface_functions.h>
 #endif // __HCC__
 
 // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define.
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/surface_functions.h b/projects/clr/hipamd/include/hip/hcc_detail/surface_functions.h
index 562cc440ed..607f221901 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/surface_functions.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/surface_functions.h
@@ -23,8 +23,6 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_SURFACE_FUNCTIONS_H
 #define HIP_INCLUDE_HIP_HCC_DETAIL_SURFACE_FUNCTIONS_H
 
-#include <hc.hpp>
-#include <hc_short_vector.hpp>
 #include <hip/hcc_detail/hip_surface_types.h>
 
 #define __SURFACE_FUNCTIONS_DECL__ static __inline__ __device__