summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJunyan He <junyan.he@intel.com>2016-02-23 14:41:08 +0800
committerJunyan He <junyan.he@intel.com>2016-02-23 14:41:08 +0800
commitb24c516fc81571762f893f27e4b2d2916d979c23 (patch)
treebdf4e13058ab2c646b623afe6a51a95ec2164b1d /src
parentf4bf8cfe4852444244532e7f611498cd07813e60 (diff)
init version
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/cl_internals.h1
-rw-r--r--src/intel/intel_driver.c12
-rw-r--r--src/intel/intel_gpgpu.c5
-rw-r--r--src/intel/intel_gpgpu.h2
5 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 96a470cc..1fd233a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${DRM_INCLUDE_DIRS}
${DRM_INCLUDE_DIRS}/../
${CMAKE_CURRENT_SOURCE_DIR}/../backend/src/backend/
- ${CMAKE_CURRENT_SOURCE_DIR}/../include
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include/CL/
${MESA_SOURCE_INCLUDES}
${LLVM_INCLUDE_DIR})
diff --git a/src/cl_internals.h b/src/cl_internals.h
index 9aeb8c12..94e55f22 100644
--- a/src/cl_internals.h
+++ b/src/cl_internals.h
@@ -34,4 +34,3 @@
#define CL_MAGIC_ACCELERATOR_INTEL_HEADER 0x7c6a08c9a7ac3e3fLL
#endif /* __CL_INTERNALS_H__ */
-
diff --git a/src/intel/intel_driver.c b/src/intel/intel_driver.c
index b3712e54..9b55ac76 100644
--- a/src/intel/intel_driver.c
+++ b/src/intel/intel_driver.c
@@ -72,12 +72,12 @@
#include <xf86drm.h>
#include <stdio.h>
-#include "cl_utils.h"
-#include "cl_alloc.h"
-#include "cl_context.h"
-#include "cl_driver.h"
-#include "cl_device_id.h"
-#include "cl_platform_id.h"
+#include "src/cl_utils.h"
+#include "src/cl_alloc.h"
+#include "src/cl_context.h"
+#include "src/cl_driver.h"
+#include "src/cl_device_id.h"
+#include "src/cl_platform_id.h"
static void
intel_driver_delete(intel_driver_t *driver)
diff --git a/src/intel/intel_gpgpu.c b/src/intel/intel_gpgpu.c
index ac92ed34..cbd52c0a 100644
--- a/src/intel/intel_gpgpu.c
+++ b/src/intel/intel_gpgpu.c
@@ -37,9 +37,10 @@
#include "program.h" // for BTI_RESERVED_NUM
#include "cl_alloc.h"
-#include "cl_utils.h"
-#include "cl_sampler.h"
+#include "src/cl_utils.h"
+#include "src/cl_sampler.h"
#include "cl_accelerator_intel.h"
+#include "../ocl_common_defines.h"
#ifndef CL_VERSION_1_2
#define CL_MEM_OBJECT_IMAGE1D 0x10F4
diff --git a/src/intel/intel_gpgpu.h b/src/intel/intel_gpgpu.h
index ccbf2fa4..5e98b88e 100644
--- a/src/intel/intel_gpgpu.h
+++ b/src/intel/intel_gpgpu.h
@@ -22,7 +22,7 @@
#define __INTEL_GPGPU_H__
#include "cl_utils.h"
-#include "cl_driver.h"
+#include "../cl_driver.h"
#include "intel/intel_batchbuffer.h"
#include "intel/intel_driver.h"