P4 to Git Change 1404293 by lmoriche@lmoriche_opencl_dev2 on 2017/05/01 16:43:07
SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime - Changes required to use the Khronos ICD sources instead of ours. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#3 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#54 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#29 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_platform.h#7 edit ... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#2 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpubinary.cpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpubinary.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#319 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#127 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#233 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#239 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/object.hpp#18 edit
Cette révision appartient à :
@@ -9,8 +9,10 @@
|
||||
#include "os/alloc.hpp"
|
||||
#include "thread/monitor.hpp"
|
||||
#include "utils/util.hpp"
|
||||
#include <icd/icd_dispatch.h>
|
||||
|
||||
#define CL_TYPES_DO(F) \
|
||||
|
||||
#define KHR_CL_TYPES_DO(F) \
|
||||
/* OpenCL type Runtime type */ \
|
||||
F(cl_context, Context) \
|
||||
F(cl_event, Event) \
|
||||
@@ -19,21 +21,26 @@
|
||||
F(cl_program, Program) \
|
||||
F(cl_device_id, Device) \
|
||||
F(cl_mem, Memory) \
|
||||
F(cl_sampler, Sampler) \
|
||||
F(cl_sampler, Sampler)
|
||||
|
||||
#define AMD_CL_TYPES_DO(F) \
|
||||
F(cl_counter_amd, Counter) \
|
||||
F(cl_perfcounter_amd, PerfCounter) \
|
||||
F(cl_threadtrace_amd, ThreadTrace) \
|
||||
F(cl_file_amd, LiquidFlashFile)
|
||||
|
||||
|
||||
#define CL_TYPES_DO(F) \
|
||||
KHR_CL_TYPES_DO(F) \
|
||||
AMD_CL_TYPES_DO(F)
|
||||
|
||||
// Forward declare ::cl_* types and amd::Class types
|
||||
//
|
||||
|
||||
#define DECLARE_CL_TYPES(CL, AMD) \
|
||||
namespace amd { \
|
||||
class AMD; \
|
||||
} \
|
||||
typedef struct _##CL { \
|
||||
} * CL;
|
||||
}
|
||||
|
||||
CL_TYPES_DO(DECLARE_CL_TYPES);
|
||||
|
||||
@@ -41,6 +48,15 @@ CL_TYPES_DO(DECLARE_CL_TYPES);
|
||||
|
||||
struct KHRicdVendorDispatchRec;
|
||||
|
||||
#define DECLARE_CL_TYPES(CL, AMD) \
|
||||
typedef struct _##CL { \
|
||||
struct KHRicdVendorDispatchRec* dispatch; \
|
||||
} * CL;
|
||||
|
||||
AMD_CL_TYPES_DO(DECLARE_CL_TYPES);
|
||||
|
||||
#undef DECLARE_CL_TYPES
|
||||
|
||||
namespace amd {
|
||||
|
||||
// Define the cl_*_type tokens for type checking.
|
||||
|
||||
Référencer dans un nouveau ticket
Bloquer un utilisateur