summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-07-11 14:32:00 -0700
committerTom Stellard <thomas.stellard@amd.com>2013-07-11 14:32:00 -0700
commit1cdfacdedb621a39609153fc4fbd6878f2d15cd7 (patch)
tree168a86de600ed1d3225e2ade163f6a29a9eeb661 /src
parent1f1bd7b268e52a06e81a763a4ea3da00062cdd6a (diff)
XXX: Working without icd
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/clover/api/icd.hpp28
1 files changed, 12 insertions, 16 deletions
diff --git a/src/gallium/state_trackers/clover/api/icd.hpp b/src/gallium/state_trackers/clover/api/icd.hpp
index b842055c220..612938f629b 100644
--- a/src/gallium/state_trackers/clover/api/icd.hpp
+++ b/src/gallium/state_trackers/clover/api/icd.hpp
@@ -42,26 +42,10 @@ namespace clover {
typedef struct _cl_icd_dispatch cl_icd_dispatch;
-#define UNWRAP_ICD_OBJECT(obj) (obj)->__obj
-#define UNWRAP_ICD_PARAM(type, name) \
- type *name = _##name->__obj;
-#define WRAP_ICD_OBJECT(type, obj) \
- new type(obj)
-#define WRAP_ICD_RET_OBJECT(clover_type, cl_type, out, in) \
- clover::clover_type *_##out; \
- ret_object(&_##out, in); \
- if (out) \
- *out = new cl_type(_##out);
-
#else // USE_ICD
typedef unsigned cl_icd_dispatch;
-#define UNWRAP_ICD_OBJECT(obj) (obj)
-#define UNWRAP_ICD_PARAM(type, name) type *name = _##name;
-#define WRAP_ICD_OBJECT(type, obj) (obj)
-#define WRAP_ICD_RET_OBJECT(clover_type, cl_type, out, in) ret_object(out, in)
-
#endif // USE_ICD
extern cl_icd_dispatch clover_icd_dispatch;
@@ -112,6 +96,18 @@ ICD_CLASS_DECL(_cl_mem, memory_obj)
ICD_CLASS_DECL(_cl_program, program)
ICD_CLASS_DECL(_cl_sampler, sampler)
+#define UNWRAP_ICD_OBJECT(obj) (obj)->__obj
+#define UNWRAP_ICD_PARAM(type, name) \
+ type *name = _##name->__obj;
+#define WRAP_ICD_OBJECT(type, obj) \
+ new type(obj)
+#define WRAP_ICD_RET_OBJECT(clover_type, cl_type, out, in) \
+ clover::clover_type *_##out; \
+ ret_object(&_##out, in); \
+ if (out) \
+ *out = new cl_type(_##out);
+
+
#define UNWRAP_ICD_PARAM_COMMAND_QUEUE(name) \
UNWRAP_ICD_PARAM(clover::command_queue, name)
#define UNWRAP_ICD_PARAM_CONTEXT(name) \