Skip to content

Commit 99df83d

Browse files
committed
[libclc] Fix merge conflict resolution in CLC native builtins
These should be as in upstream as CLC shouldn't depend on SPIR-V builtins. The actual SPIR-V versions of these builtins don't call into CLC at this time anyway. This just looks like a merge conflict resultion gone awry.
1 parent cd7dae5 commit 99df83d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

libclc/clc/lib/generic/math/clc_native_recip.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE native_recip(__CLC_GENTYPE val) {
10-
return __spirv_ocl_native_recip(val);
9+
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_native_recip(__CLC_GENTYPE val) {
10+
return 1.0f / val;
1111
}

libclc/clc/lib/generic/math/clc_native_rsqrt.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE native_rsqrt(__CLC_GENTYPE val) {
10-
return __spirv_ocl_native_rsqrt(val);
9+
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_native_rsqrt(__CLC_GENTYPE val) {
10+
return 1.0f / __clc_native_sqrt(val);
1111
}

0 commit comments

Comments
 (0)