Skip to content

Commit 2605572

Browse files
committed
undo changes to clc
1 parent 4bb7d39 commit 2605572

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

libclc/clc/include/clc/misc/shuffle2_def.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
// The return type is same base type as the input type, with the same vector
1919
// size as the mask. Elements in the mask must be the same size (number of bits)
2020
// as the input value., e.g. char8 ret = shuffle(char2 x, uchar8 mask);
21-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
21+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
2222
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 2) x,
2323
__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 2) y, __CLC_U_GENTYPE mask) {
2424
return __IMPL_FUNCTION(FUNCTION)(x, y, mask);
2525
}
26-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
26+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
2727
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 4) x,
2828
__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 4) y, __CLC_U_GENTYPE mask) {
2929
return __IMPL_FUNCTION(FUNCTION)(x, y, mask);
3030
}
31-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
31+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
3232
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 8) x,
3333
__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 8) y, __CLC_U_GENTYPE mask) {
3434
return __IMPL_FUNCTION(FUNCTION)(x, y, mask);
3535
}
36-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
36+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
3737
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 16) x,
3838
__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 16) y, __CLC_U_GENTYPE mask) {
3939
return __IMPL_FUNCTION(FUNCTION)(x, y, mask);

libclc/clc/include/clc/misc/shuffle_def.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
// The return type is same base type as the input type, with the same vector
1919
// size as the mask. Elements in the mask must be the same size (number of bits)
2020
// as the input value., e.g. char8 ret = shuffle(char2 x, uchar8 mask);
21-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
21+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
2222
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 2) x, __CLC_U_GENTYPE mask) {
2323
return __IMPL_FUNCTION(FUNCTION)(x, mask);
2424
}
25-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
25+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
2626
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 4) x, __CLC_U_GENTYPE mask) {
2727
return __IMPL_FUNCTION(FUNCTION)(x, mask);
2828
}
29-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
29+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
3030
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 8) x, __CLC_U_GENTYPE mask) {
3131
return __IMPL_FUNCTION(FUNCTION)(x, mask);
3232
}
33-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE
33+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE
3434
FUNCTION(__CLC_XCONCAT(__CLC_SCALAR_GENTYPE, 16) x, __CLC_U_GENTYPE mask) {
3535
return __IMPL_FUNCTION(FUNCTION)(x, mask);
3636
}

libclc/clc/lib/generic/atomic/clc_atomic_compare_exchange.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifdef __CLC_FPSIZE
2525

2626
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
27-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_atomic_compare_exchange( \
27+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_atomic_compare_exchange( \
2828
volatile ADDRSPACE __CLC_GENTYPE *Ptr, __CLC_GENTYPE Comparator, \
2929
__CLC_GENTYPE Value, int MemoryOrderEqual, int MemoryOrderUnequal, \
3030
int MemoryScope) { \
@@ -38,7 +38,7 @@
3838
#else
3939

4040
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
41-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_atomic_compare_exchange( \
41+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_atomic_compare_exchange( \
4242
volatile ADDRSPACE __CLC_GENTYPE *Ptr, __CLC_GENTYPE Comparator, \
4343
__CLC_GENTYPE Value, int MemoryOrderEqual, int MemoryOrderUnequal, \
4444
int MemoryScope) { \

libclc/clc/lib/generic/atomic/clc_atomic_def.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131

3232
#ifdef __CLC_NO_VALUE_ARG
3333
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
34-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION( \
34+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE FUNCTION( \
3535
volatile ADDRSPACE __CLC_GENTYPE *Ptr, int MemoryOrder, \
3636
int MemoryScope) { \
3737
return __CLC_AS_RETTYPE(__IMPL_FUNCTION( \
3838
(ADDRSPACE __CLC_PTR_CASTTYPE *)Ptr, MemoryOrder, MemoryScope)); \
3939
}
4040
#elif defined(__CLC_INC_DEC)
4141
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
42-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION( \
42+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE FUNCTION( \
4343
volatile ADDRSPACE __CLC_GENTYPE *Ptr, int MemoryOrder, \
4444
int MemoryScope) { \
4545
return __CLC_AS_RETTYPE( \
@@ -48,15 +48,15 @@
4848
}
4949
#elif defined(__CLC_RETURN_VOID)
5050
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
51-
_CLC_OVERLOAD _CLC_DEF void FUNCTION(volatile ADDRSPACE __CLC_GENTYPE *Ptr, \
52-
__CLC_GENTYPE Value, int MemoryOrder, \
53-
int MemoryScope) { \
51+
_CLC_OVERLOAD _CLC_DECL void FUNCTION(volatile ADDRSPACE __CLC_GENTYPE *Ptr, \
52+
__CLC_GENTYPE Value, int MemoryOrder, \
53+
int MemoryScope) { \
5454
__IMPL_FUNCTION((ADDRSPACE __CLC_PTR_CASTTYPE *)Ptr, Value, MemoryOrder, \
5555
MemoryScope); \
5656
}
5757
#else
5858
#define __CLC_DEFINE_ATOMIC(ADDRSPACE) \
59-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION( \
59+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE FUNCTION( \
6060
volatile ADDRSPACE __CLC_GENTYPE *Ptr, __CLC_GENTYPE Value, \
6161
int MemoryOrder, int MemoryScope) { \
6262
return __CLC_AS_RETTYPE( \

0 commit comments

Comments
 (0)