From f1b844f51e2cc91514f0d9a016d6180cd44fb459 Mon Sep 17 00:00:00 2001 From: Lakhan Singh Date: Tue, 12 Jun 2018 15:22:05 +0530 Subject: [PATCH 01/29] [GETandALGN]: Get channel and alignment details [ROCm/hip commit: de605c0407fc8f0cb305474f4d241cd8b68f6796] --- .../tests/src/texture/hipGetAlgntoffset2D.cpp | 98 ++++++++++++ .../hip/tests/src/texture/hipGetChanDesc.cpp | 139 ++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp create mode 100644 projects/hip/tests/src/texture/hipGetChanDesc.cpp diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp new file mode 100644 index 0000000000..66f60a4eec --- /dev/null +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -0,0 +1,98 @@ +/* +Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +/* HIT_START + * BUILD: %t %s ../test_common.cpp + * RUN: %t + * HIT_END + */ +#include +#include +#include +#include + +#include +#include "test_common.h" + +using namespace std; +#define HIP_ENABLE_PRINTF +#define R 8 //rows, height +#define C 8 //columns, width + + +texture tex; + +bool testResult = true; + +void runTest(void); + +int main(int argc, char** argv) { + runTest(); + + if (testResult) { + passed(); + } else { + exit(EXIT_FAILURE); + } +} + + +void runTest() +{ + +string out; +int val[R][C],i,j; +size_t offset; + +for(i=0;i +#include +#include + +#include +#include "test_common.h" + +using namespace std; +#define R 8 //rows, height +#define C 8 //columns, width + + +texture tex; + +bool testResult = true; + +void runTest(void); + +int main(int argc, char** argv) { + runTest(); + + if (testResult) { + passed(); + } else { + exit(EXIT_FAILURE); + } +} + + +void runTest() +{ + +string out; +int val[R][C],i,j; + +for(i=0;i Date: Fri, 15 Jun 2018 11:30:02 +0530 Subject: [PATCH 02/29] Made changes as suggested. [ROCm/hip commit: 90c8230cfa1a286472cab64a134f2f548d9ea84f] --- .../tests/src/texture/hipGetAlgntoffset2D.cpp | 28 ++---- .../hip/tests/src/texture/hipGetChanDesc.cpp | 87 ++----------------- 2 files changed, 14 insertions(+), 101 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index 66f60a4eec..ead492dbfc 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved. +Copyright (c) 2015-Present Advanced Micro Devices, Inc. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -25,16 +25,10 @@ THE SOFTWARE. * RUN: %t * HIT_END */ -#include -#include -#include -#include - #include #include "test_common.h" using namespace std; -#define HIP_ENABLE_PRINTF #define R 8 //rows, height #define C 8 //columns, width @@ -59,7 +53,6 @@ int main(int argc, char** argv) { void runTest() { -string out; int val[R][C],i,j; size_t offset; @@ -73,26 +66,19 @@ for(i=0;i -#include -#include #include #include "test_common.h" @@ -36,9 +33,6 @@ using namespace std; #define R 8 //rows, height #define C 8 //columns, width - -texture tex; - bool testResult = true; void runTest(void); @@ -57,83 +51,16 @@ int main(int argc, char** argv) { void runTest() { -string out; -int val[R][C],i,j; - -for(i=0;i Date: Wed, 11 Jul 2018 11:51:08 +0530 Subject: [PATCH 03/29] Update hipGetAlgntoffset2D.cpp [ROCm/hip commit: add8693c9c88b72d27b44cb4a32019e1711da8b6] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index ead492dbfc..34376a0a76 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -37,10 +37,10 @@ texture tex; bool testResult = true; -void runTest(void); +bool runTest(void); int main(int argc, char** argv) { - runTest(); + testResult=runTest(); if (testResult) { passed(); @@ -50,7 +50,7 @@ int main(int argc, char** argv) { } -void runTest() +bool runTest() { int val[R][C],i,j; @@ -81,4 +81,5 @@ HIPCHECK(hipGetTextureAlignmentOffset(&offset,&tex)); HIPCHECK(hipUnbindTexture(&tex)); HIPCHECK(hipFreeArray(hipArray)); +return testResult; } From ce44c86a884e4323efdc5d2d9e92c71794037c8f Mon Sep 17 00:00:00 2001 From: lthakur Date: Wed, 11 Jul 2018 11:53:16 +0530 Subject: [PATCH 04/29] Update hipGetChanDesc.cpp [ROCm/hip commit: 70579414318348d77b22b272667a52414d26b3fb] --- projects/hip/tests/src/texture/hipGetChanDesc.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetChanDesc.cpp b/projects/hip/tests/src/texture/hipGetChanDesc.cpp index a3e8c7c3e7..254392ffd2 100644 --- a/projects/hip/tests/src/texture/hipGetChanDesc.cpp +++ b/projects/hip/tests/src/texture/hipGetChanDesc.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc * RUN: %t * HIT_END */ @@ -35,10 +35,10 @@ using namespace std; bool testResult = true; -void runTest(void); +bool runTest(void); int main(int argc, char** argv) { - runTest(); + testResult=runTest(); if (testResult) { passed(); @@ -48,7 +48,7 @@ int main(int argc, char** argv) { } -void runTest() +bool runTest() { hipChannelFormatDesc chan_test,chan_desc=hipCreateChannelDesc(32,0,0,0,hipChannelFormatKindSigned); @@ -63,4 +63,5 @@ else testResult=false; HIPCHECK(hipFreeArray(hipArray)); +return testResult; } From 0aa1d295de7dc54e2195eec4037f4f0cab0a0f81 Mon Sep 17 00:00:00 2001 From: lthakur Date: Wed, 11 Jul 2018 11:54:05 +0530 Subject: [PATCH 05/29] Update hipGetAlgntoffset2D.cpp [ROCm/hip commit: db437af69366010119ebd91115f4e6b6825dcbbd] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index 34376a0a76..b1ab647755 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc * RUN: %t * HIT_END */ From a5228f64e5ad56f2acc0fbb459c10ea811138893 Mon Sep 17 00:00:00 2001 From: lthakur Date: Wed, 11 Jul 2018 15:23:21 +0530 Subject: [PATCH 06/29] Update hipGetAlgntoffset2D.cpp [ROCm/hip commit: bfd99f8af790fb8a5b009107d547235c1047c99a] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index b1ab647755..5b6ddc3974 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp * RUN: %t * HIT_END */ From 7fe46338d3d6b4c87f351f0744a0469c7e032d6b Mon Sep 17 00:00:00 2001 From: lthakur Date: Wed, 11 Jul 2018 15:24:00 +0530 Subject: [PATCH 07/29] Update hipGetChanDesc.cpp [ROCm/hip commit: 429046edef919ab94918b50db1304c9e4e459253] --- projects/hip/tests/src/texture/hipGetChanDesc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/tests/src/texture/hipGetChanDesc.cpp b/projects/hip/tests/src/texture/hipGetChanDesc.cpp index 254392ffd2..8a72f14829 100644 --- a/projects/hip/tests/src/texture/hipGetChanDesc.cpp +++ b/projects/hip/tests/src/texture/hipGetChanDesc.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp * RUN: %t * HIT_END */ From af7d818063d1da2f2f091cb4ac9ef2e223049407 Mon Sep 17 00:00:00 2001 From: lthakur Date: Tue, 17 Jul 2018 10:32:30 +0530 Subject: [PATCH 08/29] Removed unused ,chan_test, variable. [ROCm/hip commit: fa36c49c81fb9b8299e9cce55e44d8e1344db365] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index 5b6ddc3974..a164222e8c 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -63,7 +63,7 @@ for(i=0;i Date: Tue, 17 Jul 2018 13:35:22 +0530 Subject: [PATCH 09/29] Update hipGetAlgntoffset2D.cpp Removed bool variable 'testResult' from global scope and confined it to the function. [ROCm/hip commit: feaa30076e613f33edddfc015dd04753d321f31f] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index a164222e8c..213c49caaa 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -35,12 +35,10 @@ using namespace std; texture tex; -bool testResult = true; - bool runTest(void); int main(int argc, char** argv) { - testResult=runTest(); + bool testResult=runTest(); if (testResult) { passed(); @@ -81,5 +79,5 @@ HIPCHECK(hipGetTextureAlignmentOffset(&offset,&tex)); HIPCHECK(hipUnbindTexture(&tex)); HIPCHECK(hipFreeArray(hipArray)); -return testResult; +return true; } From 542f72738ad3fdba4899cf3fcf069d4429a6c17f Mon Sep 17 00:00:00 2001 From: lthakur Date: Tue, 17 Jul 2018 13:37:08 +0530 Subject: [PATCH 10/29] Update hipGetAlgntoffset2D.cpp Removed unwanted space. [ROCm/hip commit: a185e8c1f969b98a5f47fa354c55d8cd19e6cc9c] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index 213c49caaa..2343d7a7fb 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -32,7 +32,6 @@ using namespace std; #define R 8 //rows, height #define C 8 //columns, width - texture tex; bool runTest(void); @@ -47,10 +46,8 @@ int main(int argc, char** argv) { } } - bool runTest() { - int val[R][C],i,j; size_t offset; @@ -59,10 +56,7 @@ for(i=0;i Date: Tue, 17 Jul 2018 13:40:54 +0530 Subject: [PATCH 11/29] Update hipGetChanDesc.cpp Removed bool variable 'testResult' from global scope and confined it to the function. [ROCm/hip commit: e2eeee29daecbdcad7f92bb12a736b73fc6ee402] --- projects/hip/tests/src/texture/hipGetChanDesc.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/hip/tests/src/texture/hipGetChanDesc.cpp b/projects/hip/tests/src/texture/hipGetChanDesc.cpp index 8a72f14829..9034668ccf 100644 --- a/projects/hip/tests/src/texture/hipGetChanDesc.cpp +++ b/projects/hip/tests/src/texture/hipGetChanDesc.cpp @@ -33,12 +33,10 @@ using namespace std; #define R 8 //rows, height #define C 8 //columns, width -bool testResult = true; - bool runTest(void); int main(int argc, char** argv) { - testResult=runTest(); + bool testResult=runTest(); if (testResult) { passed(); @@ -47,12 +45,10 @@ int main(int argc, char** argv) { } } - bool runTest() { - +bool testResult=true; hipChannelFormatDesc chan_test,chan_desc=hipCreateChannelDesc(32,0,0,0,hipChannelFormatKindSigned); - hipArray *hipArray; HIPCHECK(hipMallocArray(&hipArray, &chan_desc,C,R,0)); HIPCHECK(hipGetChannelDesc(&chan_test,hipArray)); From 54bf67ff2288ba356fd895882bedef1fdf490f85 Mon Sep 17 00:00:00 2001 From: Jorghi12 Date: Mon, 23 Jul 2018 18:16:00 -0400 Subject: [PATCH 12/29] Fixing a HIP bug that causes DEBUG symbols to be dropped. I've noticed that in the generated makefiles, we'd have if(NOT build_configuration) set(build_configuration Debug) endif() However, only definitions with all capitals are provided. e.g. set(HIP_HCC_FLAGS_DEBUG -g) This is because of lines 442 to 448. We capitalize the configuration ${config_upper}. This PR fixes this bug. [ROCm/hip commit: 865b01541063b27a4ba1261e063f6ab63c607f31] --- projects/hip/cmake/FindHIP.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/cmake/FindHIP.cmake b/projects/hip/cmake/FindHIP.cmake index 9a1a285921..ec2c98b642 100644 --- a/projects/hip/cmake/FindHIP.cmake +++ b/projects/hip/cmake/FindHIP.cmake @@ -380,7 +380,7 @@ endmacro() ############################################################################### macro(HIP_PREPARE_TARGET_COMMANDS _target _format _generated_files _source_files) set(_hip_flags "") - set(_hip_build_configuration "${CMAKE_BUILD_TYPE}") + string(TOUPPER _hip_build_configuration "${CMAKE_BUILD_TYPE}") if(HIP_HOST_COMPILATION_CPP) set(HIP_C_OR_CXX CXX) else() From af407ce8beae27c1c3385553806ff5a6e179b821 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Tue, 24 Jul 2018 10:11:26 +0530 Subject: [PATCH 13/29] Set offset in hipGetTextureAlignmentOffset [ROCm/hip commit: 867a4aa9714dfeb51024885384f9eaf0c24ddfdd] --- projects/hip/src/hip_texture.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/hip/src/hip_texture.cpp b/projects/hip/src/hip_texture.cpp index d6caf853de..8b335f336f 100644 --- a/projects/hip/src/hip_texture.cpp +++ b/projects/hip/src/hip_texture.cpp @@ -676,6 +676,7 @@ hipError_t hipGetTextureAlignmentOffset(size_t* offset, const textureReference* auto ctx = ihipGetTlsDefaultCtx(); if (ctx) { + *offset = 0; } return ihipLogStatus(hip_status); } From c13c5c9476886f4200fd1f40f1d7f618188efabb Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Tue, 24 Jul 2018 12:25:40 +0530 Subject: [PATCH 14/29] Null check before setting offset [ROCm/hip commit: bc4cdf7e41e608d26af8acc4d1dfa7937cd84f96] --- projects/hip/src/hip_texture.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/hip/src/hip_texture.cpp b/projects/hip/src/hip_texture.cpp index 8b335f336f..82bc5b5d8a 100644 --- a/projects/hip/src/hip_texture.cpp +++ b/projects/hip/src/hip_texture.cpp @@ -676,7 +676,8 @@ hipError_t hipGetTextureAlignmentOffset(size_t* offset, const textureReference* auto ctx = ihipGetTlsDefaultCtx(); if (ctx) { - *offset = 0; + if(offset != nullptr) + *offset = 0; } return ihipLogStatus(hip_status); } From fea10ee7cddad5ed426f44f7b6d53b1caacd5779 Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Tue, 24 Jul 2018 20:39:48 +0000 Subject: [PATCH 15/29] Fix return EXIT_FAILURE if ballot or anyall fails [ROCm/hip commit: 2b73bccbefc2113083c7c4cfa0224cc7a76a2200] --- projects/hip/tests/src/deviceLib/hip_anyall.cpp | 8 ++++++-- projects/hip/tests/src/deviceLib/hip_ballot.cpp | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/hip/tests/src/deviceLib/hip_anyall.cpp b/projects/hip/tests/src/deviceLib/hip_anyall.cpp index b4c747b7d7..21ad9f871c 100644 --- a/projects/hip/tests/src/deviceLib/hip_anyall.cpp +++ b/projects/hip/tests/src/deviceLib/hip_anyall.cpp @@ -96,13 +96,17 @@ int main(int argc, char* argv[]) { #if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) if (anycount == 1 && allcount == 1) printf("PASSED\n"); - else + else { printf("FAILED\n"); + return EXIT_FAILURE; + } #else if (anycount == 0 && allcount == 1) printf("PASSED\n"); - else + else { printf("FAILED\n"); + return EXIT_FAILURE; + } #endif return EXIT_SUCCESS; diff --git a/projects/hip/tests/src/deviceLib/hip_ballot.cpp b/projects/hip/tests/src/deviceLib/hip_ballot.cpp index 46654d15a3..603614b22f 100644 --- a/projects/hip/tests/src/deviceLib/hip_ballot.cpp +++ b/projects/hip/tests/src/deviceLib/hip_ballot.cpp @@ -89,7 +89,9 @@ int main(int argc, char* argv[]) { if (divergent_count == 1) printf("PASSED\n"); - else + else { printf("FAILED\n"); + return EXIT_FAILURE; + } return EXIT_SUCCESS; } From ef0e0011310a552fc7e83e5e2b3241cb1cb3698d Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 25 Jul 2018 15:29:57 +0530 Subject: [PATCH 16/29] [hipcc] Initialize CUDA_PATH before printing Change-Id: Ifd448b628fa4a7055f4a439ed2c817c5f11f9bef [ROCm/hip commit: 7615257ec3daa38b09baba4b7bccffc9fad270a4] --- projects/hip/bin/hipcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc index 7f7dfd31da..9df3459fd1 100755 --- a/projects/hip/bin/hipcc +++ b/projects/hip/bin/hipcc @@ -241,11 +241,11 @@ if ($HIP_PLATFORM eq "clang") { } } elsif ($HIP_PLATFORM eq "nvcc") { + $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda'; $HIP_INCLUDE_PATH = "$HIP_PATH/include"; if ($verbose & 0x2) { print ("CUDA_PATH=$CUDA_PATH\n"); } - $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda'; $HIPCC="$CUDA_PATH/bin/nvcc"; $HIPCXXFLAGS .= " -Wno-deprecated-gpu-targets "; From 92eaeabe993b672b5f79c3820912dbeccb84b1e2 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 25 Jul 2018 15:32:14 +0530 Subject: [PATCH 17/29] [FindHIP] Remove rdynamic from CMAKE_SHARED_LIBRARY_LINK_HIP_FLAGS CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS contains -rdynamic which does not go well with nvcc Change-Id: I10e6d21553de0e43c6a7ae5fb3ec2418087959ff [ROCm/hip commit: 36c767029320e3d1eda81a4f5bb5fb2b0ff34791] --- projects/hip/cmake/FindHIP.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/cmake/FindHIP.cmake b/projects/hip/cmake/FindHIP.cmake index 9a1a285921..c3f7616712 100644 --- a/projects/hip/cmake/FindHIP.cmake +++ b/projects/hip/cmake/FindHIP.cmake @@ -33,7 +33,7 @@ set(CMAKE_HIP_ARCHIVE_FINISH ${CMAKE_CXX_ARCHIVE_FINISH}) set(CMAKE_SHARED_LIBRARY_SONAME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG}) set(CMAKE_SHARED_LIBRARY_CREATE_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS}) set(CMAKE_SHARED_LIBRARY_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) -set(CMAKE_SHARED_LIBRARY_LINK_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}) +#set(CMAKE_SHARED_LIBRARY_LINK_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}) set(CMAKE_SHARED_LIBRARY_RUNTIME_HIP_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG}) set(CMAKE_SHARED_LIBRARY_RUNTIME_HIP_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP}) set(CMAKE_SHARED_LIBRARY_LINK_STATIC_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_STATIC_CXX_FLAGS}) From ceacd2f23dd197a09b6867209026e867d6d3077d Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 25 Jul 2018 15:39:45 +0530 Subject: [PATCH 18/29] [tests] Fixed build & disabled run of hipStdComplex on nvcc path Change-Id: I885e96902faa065f6559183f33b6a7aa1f37e393 [ROCm/hip commit: 9d8dd3a4e6e8502296912d97de5fbe87c186a029] --- projects/hip/tests/src/deviceLib/hipStdComplex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/hip/tests/src/deviceLib/hipStdComplex.cpp b/projects/hip/tests/src/deviceLib/hipStdComplex.cpp index f3f5627a93..594b0c6bdd 100644 --- a/projects/hip/tests/src/deviceLib/hipStdComplex.cpp +++ b/projects/hip/tests/src/deviceLib/hipStdComplex.cpp @@ -17,8 +17,8 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s - * RUN: %t + * BUILD: %t %s NVCC_OPTIONS -std=c++11 + * RUN: %t EXCLUDE_HIP_PLATFORM nvcc * HIT_END */ #include "test_common.h" From d5e3f869a4bc7b15298347d85ba4639f7a01171e Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 25 Jul 2018 15:41:04 +0530 Subject: [PATCH 19/29] [tests] Fixed hipLaunchParm test on nvcc path - Uses c++11 features. Added it to nvcc options - Arguments for some kernels exceeded 4096 bytes which is the limit imposed by nvcc. Reduced BLOCK_DIM_SIZE to 512 to handle this - Fixed compilation issues on nvcc path Change-Id: I14f6b28afcb7c6b24a085fd707b2104e2ed64627 [ROCm/hip commit: 4c41d624359a5d605ac96f083edec79b2efec298] --- projects/hip/tests/src/kernel/hipLaunchParm.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/hip/tests/src/kernel/hipLaunchParm.cpp b/projects/hip/tests/src/kernel/hipLaunchParm.cpp index befdcc656d..18c882c86c 100644 --- a/projects/hip/tests/src/kernel/hipLaunchParm.cpp +++ b/projects/hip/tests/src/kernel/hipLaunchParm.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp + * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 * RUN: %t * HIT_END */ @@ -54,7 +54,7 @@ THE SOFTWARE. // Bit fields are broken #define ENABLE_BIT_FIELDS 0 -static const int BLOCK_DIM_SIZE = 1024; +static const int BLOCK_DIM_SIZE = 512; // allocate memory on device and host for result validation static bool *result_d, *result_h; @@ -882,9 +882,10 @@ int main() { // Test: Passing struct which is initiazed out of order // accessing same elements in order from device ResetValidationMem(); - hipLaunchKernelStruct_t20 hipLaunchKernelStruct_h20 = - // out of order initalization - {.name = 'A', .rank = 2, .age = 42}; + hipLaunchKernelStruct_t20 hipLaunchKernelStruct_h20; + hipLaunchKernelStruct_h20.name = 'A'; + hipLaunchKernelStruct_h20.rank = 2; + hipLaunchKernelStruct_h20.age = 42; bool *result_d20, *result_h20; #if ENABLE_OUT_OF_ORDER_INITIALIZATION hipLaunchKernelGGL(HIP_KERNEL_NAME(hipLaunchKernelStructFunc20), From c53a494be96f34bf49ae187b3be37c6a0668630d Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Wed, 25 Jul 2018 19:52:19 +0000 Subject: [PATCH 20/29] Enable HIP texture functions with HIP vector types Include texture_functions.h on HIP-Clang path. Use HIP vector types instead of hc::short_vectors for texture_functions, and remove HCC headers. [ROCm/hip commit: 8c50bcfdab55884829aa30e41713b6bf2361a49f] --- .../hip/include/hip/hcc_detail/hip_runtime.h | 2 +- .../hip/hcc_detail/texture_functions.h | 2638 +++++++++-------- 2 files changed, 1330 insertions(+), 1310 deletions(-) diff --git a/projects/hip/include/hip/hcc_detail/hip_runtime.h b/projects/hip/include/hip/hcc_detail/hip_runtime.h index c2ae6e8e4f..075a8e377a 100644 --- a/projects/hip/include/hip/hcc_detail/hip_runtime.h +++ b/projects/hip/include/hip/hcc_detail/hip_runtime.h @@ -110,9 +110,9 @@ extern int HIP_TRACE_API; #include #include #include +#include #if __HCC__ #include -#include #endif // __HCC__ // TODO-HCC remove old definitions ; ~1602 hcc supports __HCC_ACCELERATOR__ define. diff --git a/projects/hip/include/hip/hcc_detail/texture_functions.h b/projects/hip/include/hip/hcc_detail/texture_functions.h index 999f97e65e..0c221c1997 100644 --- a/projects/hip/include/hip/hcc_detail/texture_functions.h +++ b/projects/hip/include/hip/hcc_detail/texture_functions.h @@ -23,14 +23,13 @@ THE SOFTWARE. #ifndef HIP_INCLUDE_HIP_HCC_DETAIL_TEXTURE_FUNCTIONS_H #define HIP_INCLUDE_HIP_HCC_DETAIL_TEXTURE_FUNCTIONS_H -#include -#include +#include #include union TData { - hc::short_vector::float4::vector_value_type f; - hc::short_vector::int4::vector_value_type i; - hc::short_vector::uint4::vector_value_type u; + float4 f; + int4 i; + uint4 u; }; #define __TEXTURE_FUNCTIONS_DECL__ static __inline__ __device__ @@ -153,91 +152,112 @@ union TData { #define TEXTURE_RETURN_FLOAT_XYZW return make_float4(texel.f.x, texel.f.y, texel.f.z, texel.f.w); extern "C" { -hc::short_vector::float4::vector_value_type __ockl_image_sample_1D(unsigned int ADDRESS_SPACE_CONSTANT* i, - unsigned int ADDRESS_SPACE_CONSTANT* s, - float c)[[hc]]; -hc::short_vector::float4::vector_value_type __ockl_image_sample_1Da( +__device__ +float4 __ockl_image_sample_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c)[[hc]]; + float c); -hc::short_vector::float4::vector_value_type __ockl_image_sample_2D( +__device__ +float4 __ockl_image_sample_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c)[[hc]]; + float2 c); - -hc::short_vector::float4::vector_value_type __ockl_image_sample_2Da( +__device__ +float4 __ockl_image_sample_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c)[[hc]]; + float2 c); -float __ockl_image_sample_2Dad(unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c)[[hc]]; -float __ockl_image_sample_2Dd(unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c)[[hc]]; - -hc::short_vector::float4::vector_value_type __ockl_image_sample_3D( +__device__ +float4 __ockl_image_sample_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c)[[hc]]; + float4 c); -hc::short_vector::float4::vector_value_type __ockl_image_sample_grad_1D( - unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float dx, - float dy)[[hc]]; - -hc::short_vector::float4::vector_value_type __ockl_image_sample_grad_1Da( +__device__ +float __ockl_image_sample_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, float dx, float dy)[[hc]]; + float4 c); -hc::short_vector::float4::vector_value_type __ockl_image_sample_grad_2D( +__device__ +float __ockl_image_sample_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, hc::short_vector::float2::vector_value_type dx, - hc::short_vector::float2::vector_value_type dy)[[hc]]; + float2 c); -hc::short_vector::float4::vector_value_type __ockl_image_sample_grad_2Da( +__device__ +float4 __ockl_image_sample_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, hc::short_vector::float2::vector_value_type dx, - hc::short_vector::float2::vector_value_type dy)[[hc]]; + float4 c); -float __ockl_image_sample_grad_2Dad(unsigned int ADDRESS_SPACE_CONSTANT* i, - unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, - hc::short_vector::float2::vector_value_type dx, - hc::short_vector::float2::vector_value_type dy)[[hc]]; - -float __ockl_image_sample_grad_2Dd(unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, - hc::short_vector::float2::vector_value_type dx, - hc::short_vector::float2::vector_value_type dy)[[hc]]; - -hc::short_vector::float4::vector_value_type __ockl_image_sample_grad_3D( +__device__ +float4 __ockl_image_sample_grad_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, hc::short_vector::float4::vector_value_type dx, - hc::short_vector::float4::vector_value_type dy)[[hc]]; + float c, float dx, float dy); -hc::short_vector::float4::vector_value_type __ockl_image_sample_lod_1D( - unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float l)[[hc]]; - -hc::short_vector::float4::vector_value_type __ockl_image_sample_lod_1Da( +__device__ +float4 __ockl_image_sample_grad_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, float l)[[hc]]; + float2 c, float dx, float dy); -hc::short_vector::float4::vector_value_type __ockl_image_sample_lod_2D( +__device__ +float4 __ockl_image_sample_grad_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, float l)[[hc]]; + float2 c, float2 dx, float2 dy); -hc::short_vector::float4::vector_value_type __ockl_image_sample_lod_2Da( +__device__ +float4 __ockl_image_sample_grad_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, float l)[[hc]]; + float4 c, float2 dx, float2 dy); -float __ockl_image_sample_lod_2Dad(unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, float l)[[hc]]; - -float __ockl_image_sample_lod_2Dd(unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float2::vector_value_type c, float l)[[hc]]; - -hc::short_vector::float4::vector_value_type __ockl_image_sample_lod_3D( +__device__ +float __ockl_image_sample_grad_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - hc::short_vector::float4::vector_value_type c, float l)[[hc]]; + float4 c, float2 dx, float2 dy); + +__device__ +float __ockl_image_sample_grad_2Dd( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float2 c, float2 dx, float2 dy); + +__device__ +float4 __ockl_image_sample_grad_3D( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float4 c, float4 dx, float4 dy); + +__device__ +float4 __ockl_image_sample_lod_1D( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float c, float l); + +__device__ +float4 __ockl_image_sample_lod_1Da( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float2 c, float l); + +__device__ +float4 __ockl_image_sample_lod_2D( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float2 c, float l); + +__device__ +float4 __ockl_image_sample_lod_2Da( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float4 c, float l); + +__device__ +float __ockl_image_sample_lod_2Dad( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float4 c, float l); + +__device__ +float __ockl_image_sample_lod_2Dd( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float2 c, float l); + +__device__ +float4 __ockl_image_sample_lod_3D( + unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, + float4 c, float l); } //////////////////////////////////////////////////////////// @@ -1025,196 +1045,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex1DGrad(hipTextureObject_t textureObject, float x __TEXTURE_FUNCTIONS_DECL__ void tex2D(char* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_SET_FLOAT_XYZW; } @@ -1229,196 +1249,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex2D(hipTextureObject_t textureObject, float x, fl __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_SET_FLOAT_XYZW; } @@ -1434,196 +1454,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex2DLod(hipTextureObject_t textureObject, float x, __TEXTURE_FUNCTIONS_DECL__ void tex3D(char* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_SET_FLOAT_XYZW; } @@ -1638,7 +1658,7 @@ __TEXTURE_FUNCTIONS_DECL__ T tex3D(hipTextureObject_t textureObject, float x, fl __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -1646,7 +1666,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -1654,7 +1674,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char1* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -1662,7 +1682,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char2* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -1670,7 +1690,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char4* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -1678,7 +1698,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned char* retVal, hipTextureObject __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -1686,7 +1706,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -1694,7 +1714,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1702,7 +1722,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar4* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -1710,7 +1730,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -1718,7 +1738,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -1726,7 +1746,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -1734,7 +1754,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short4* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -1742,7 +1762,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned short* retVal, hipTextureObjec __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -1750,7 +1770,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort1* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -1758,7 +1778,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort2* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1766,7 +1786,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort4* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -1774,7 +1794,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int* retVal, hipTextureObject_t texture __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -1782,7 +1802,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int1* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -1790,7 +1810,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int2* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -1798,7 +1818,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int4* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -1806,7 +1826,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned int* retVal, hipTextureObject_ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -1814,7 +1834,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint1* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -1822,7 +1842,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint2* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1830,7 +1850,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint4* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_FLOAT; } @@ -1838,7 +1858,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_FLOAT_X; } @@ -1846,7 +1866,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_FLOAT_XY; } @@ -1854,7 +1874,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_SET_FLOAT_XYZW; } @@ -1871,189 +1891,189 @@ __TEXTURE_FUNCTIONS_DECL__ T tex3DLod(hipTextureObject_t textureObject, float x, __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned char* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned short* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned int* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_SET_FLOAT_XYZW; } @@ -2069,7 +2089,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED; } @@ -2077,7 +2097,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char1* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_X; } @@ -2085,7 +2105,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char2* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XY; } @@ -2093,7 +2113,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char4* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2102,7 +2122,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned char* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED; } @@ -2110,7 +2130,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_X; } @@ -2118,7 +2138,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2126,7 +2146,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2134,7 +2154,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED; } @@ -2142,7 +2162,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_X; } @@ -2150,7 +2170,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XY; } @@ -2158,7 +2178,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2167,7 +2187,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned short* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED; } @@ -2175,7 +2195,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort1* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_X; } @@ -2183,7 +2203,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort2* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2191,7 +2211,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort4* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2199,7 +2219,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED; } @@ -2207,7 +2227,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int1* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_X; } @@ -2215,7 +2235,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int2* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XY; } @@ -2223,7 +2243,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int4* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2232,7 +2252,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned int* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED; } @@ -2240,7 +2260,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint1* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_X; } @@ -2248,7 +2268,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint2* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2256,7 +2276,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint4* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2264,7 +2284,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_FLOAT; } @@ -2272,7 +2292,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_FLOAT_X; } @@ -2280,7 +2300,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_FLOAT_XY; } @@ -2288,7 +2308,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_SET_FLOAT_XYZW; } @@ -2305,7 +2325,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED; } @@ -2313,7 +2333,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char1* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2321,7 +2341,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char2* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2329,7 +2349,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char4* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2338,7 +2358,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned char* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2346,7 +2366,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2354,7 +2374,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2362,7 +2382,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2370,7 +2390,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED; } @@ -2378,7 +2398,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2386,7 +2406,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2394,7 +2414,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2403,7 +2423,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned short* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2411,7 +2431,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort1* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2419,7 +2439,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort2* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2427,7 +2447,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort4* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2435,7 +2455,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int* retVal, hipTextureObject_t float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED; } @@ -2443,7 +2463,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int1* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2451,7 +2471,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int2* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2459,7 +2479,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int4* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2468,7 +2488,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned int* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2476,7 +2496,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint1* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2484,7 +2504,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint2* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2492,7 +2512,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint4* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2500,7 +2520,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_FLOAT; } @@ -2508,7 +2528,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_FLOAT_X; } @@ -2516,7 +2536,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_FLOAT_XY; } @@ -2524,7 +2544,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_SET_FLOAT_XYZW; } @@ -2541,7 +2561,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED; } @@ -2549,7 +2569,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char1* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_X; } @@ -2557,7 +2577,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char2* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XY; } @@ -2565,7 +2585,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char4* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } @@ -2574,7 +2594,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned char* retVal, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED; } @@ -2582,7 +2602,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_X; } @@ -2590,7 +2610,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } @@ -2598,7 +2618,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2606,7 +2626,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED; } @@ -2614,7 +2634,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_X; } @@ -2622,7 +2642,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XY; } @@ -2630,7 +2650,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } @@ -2639,7 +2659,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned short* retVal, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED; } @@ -2647,7 +2667,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_X; } @@ -2655,7 +2675,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } @@ -2663,7 +2683,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2671,7 +2691,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int* retVal, hipTextureObject_t tex float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED; } @@ -2679,7 +2699,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int1* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_X; } @@ -2687,7 +2707,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int2* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XY; } @@ -2695,7 +2715,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int4* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_SIGNED_XYZW; } @@ -2703,7 +2723,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned int* retVal, hipTextureObj float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED; } @@ -2711,7 +2731,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint1* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_X; } @@ -2719,7 +2739,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint2* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XY; } @@ -2727,7 +2747,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint4* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2735,7 +2755,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_FLOAT; } @@ -2743,7 +2763,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_FLOAT_X; } @@ -2751,7 +2771,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_FLOAT_XY; } @@ -2759,7 +2779,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_SET_FLOAT_XYZW; } @@ -2776,7 +2796,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -2784,7 +2804,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char1* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -2792,7 +2812,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char2* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -2800,7 +2820,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char4* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2809,7 +2829,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned char* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -2817,7 +2837,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -2825,7 +2845,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2833,7 +2853,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2841,7 +2861,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -2849,7 +2869,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -2857,7 +2877,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -2865,7 +2885,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2874,7 +2894,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned short* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -2882,7 +2902,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort1* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -2890,7 +2910,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort2* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2898,7 +2918,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort4* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2906,7 +2926,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED; } @@ -2914,7 +2934,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int1* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_X; } @@ -2922,7 +2942,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int2* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XY; } @@ -2930,7 +2950,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int4* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_SIGNED_XYZW; } @@ -2939,7 +2959,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned int* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED; } @@ -2947,7 +2967,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint1* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_X; } @@ -2955,7 +2975,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint2* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XY; } @@ -2963,7 +2983,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint4* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2971,7 +2991,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_FLOAT; } @@ -2979,7 +2999,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_FLOAT_X; } @@ -2987,7 +3007,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_FLOAT_XY; } @@ -2995,7 +3015,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_SET_FLOAT_XYZW; } @@ -4799,28 +4819,28 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DGrad(texture texRe template __TEXTURE_FUNCTIONS_DECL__ char tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR; } template __TEXTURE_FUNCTIONS_DECL__ char1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_X; } template __TEXTURE_FUNCTIONS_DECL__ char2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_XY; } template __TEXTURE_FUNCTIONS_DECL__ char4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -4828,56 +4848,56 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR; } template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_X; } template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_XY; } template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_XYZW; } template __TEXTURE_FUNCTIONS_DECL__ short tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT; } template __TEXTURE_FUNCTIONS_DECL__ short1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_X; } template __TEXTURE_FUNCTIONS_DECL__ short2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_XY; } template __TEXTURE_FUNCTIONS_DECL__ short4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_XYZW; } @@ -4885,56 +4905,56 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT; } template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_X; } template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_XY; } template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_XYZW; } template __TEXTURE_FUNCTIONS_DECL__ int tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT; } template __TEXTURE_FUNCTIONS_DECL__ int1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_X; } template __TEXTURE_FUNCTIONS_DECL__ int2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_XY; } template __TEXTURE_FUNCTIONS_DECL__ int4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_XYZW; } @@ -4942,28 +4962,28 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT; } template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_X; } template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_XY; } template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_XYZW; } @@ -4974,7 +4994,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR; } @@ -4982,7 +5002,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_X; } @@ -4990,7 +5010,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_XY; } @@ -4998,7 +5018,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -5006,7 +5026,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR; } @@ -5014,7 +5034,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_X; } @@ -5022,7 +5042,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_XY; } @@ -5030,7 +5050,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5038,7 +5058,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT; } @@ -5046,7 +5066,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_X; } @@ -5054,7 +5074,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_XY; } @@ -5062,7 +5082,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_SHORT_XYZW; } @@ -5071,7 +5091,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2D(texture __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_X; } @@ -5087,7 +5107,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_XY; } @@ -5095,7 +5115,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_USHORT_XYZW; } @@ -5103,7 +5123,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT; } @@ -5111,7 +5131,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_X; } @@ -5119,7 +5139,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_XY; } @@ -5127,7 +5147,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_INT_XYZW; } @@ -5135,7 +5155,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT; } @@ -5143,7 +5163,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_X; } @@ -5151,7 +5171,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_XY; } @@ -5159,7 +5179,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_UINT_XYZW; } @@ -5167,21 +5187,21 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT; } template __TEXTURE_FUNCTIONS_DECL__ float tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT; } template __TEXTURE_FUNCTIONS_DECL__ float1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_X; } @@ -5189,14 +5209,14 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_X; } template __TEXTURE_FUNCTIONS_DECL__ float2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_XY; } @@ -5204,14 +5224,14 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_XY; } template __TEXTURE_FUNCTIONS_DECL__ float4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5219,7 +5239,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, hc::short_vector::float2(x, y).get_vector()); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5229,7 +5249,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR; } @@ -5237,7 +5257,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_X; } @@ -5245,7 +5265,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_XY; } @@ -5253,7 +5273,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -5261,7 +5281,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR; } @@ -5269,7 +5289,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_X; } @@ -5277,7 +5297,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_XY; } @@ -5285,7 +5305,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5293,7 +5313,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT; } @@ -5301,7 +5321,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_X; } @@ -5309,7 +5329,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_XY; } @@ -5317,7 +5337,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -5325,7 +5345,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT; } @@ -5333,7 +5353,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_X; } @@ -5341,7 +5361,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_XY; } @@ -5349,7 +5369,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_XYZW; } @@ -5357,7 +5377,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT; } @@ -5365,7 +5385,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_X; } @@ -5373,7 +5393,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_XY; } @@ -5381,7 +5401,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_XYZW; } @@ -5389,7 +5409,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT; } @@ -5397,7 +5417,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_X; } @@ -5405,7 +5425,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_XY; } @@ -5413,7 +5433,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_XYZW; } @@ -5421,7 +5441,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT; } @@ -5429,7 +5449,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_X; } @@ -5437,7 +5457,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_XY; } @@ -5445,7 +5465,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5456,7 +5476,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR; } @@ -5465,7 +5485,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_X; } @@ -5474,7 +5494,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_XY; } @@ -5483,7 +5503,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -5492,7 +5512,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_X; } @@ -5510,7 +5530,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_XY; } @@ -5519,7 +5539,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5528,7 +5548,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT; } @@ -5537,7 +5557,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_X; } @@ -5546,7 +5566,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_XY; } @@ -5555,7 +5575,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -5564,7 +5584,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_X; } @@ -5582,7 +5602,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_XY; } @@ -5591,7 +5611,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_USHORT_XYZW; } @@ -5600,7 +5620,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT; } @@ -5609,7 +5629,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_X; } @@ -5618,7 +5638,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_XY; } @@ -5627,7 +5647,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_INT_XYZW; } @@ -5636,7 +5656,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_X; } @@ -5654,7 +5674,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_XY; } @@ -5663,7 +5683,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_UINT_XYZW; } @@ -5672,7 +5692,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT; } @@ -5681,7 +5701,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_X; } @@ -5690,7 +5710,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_XY; } @@ -5699,7 +5719,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, hc::short_vector::float2(x, y).get_vector(), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5709,9 +5729,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR; } @@ -5719,9 +5739,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_X; } @@ -5729,9 +5749,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XY; } @@ -5739,9 +5759,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -5749,9 +5769,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR; } @@ -5759,9 +5779,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_X; } @@ -5769,9 +5789,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_XY; } @@ -5779,9 +5799,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5789,9 +5809,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT; } @@ -5799,9 +5819,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_X; } @@ -5809,9 +5829,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_XY; } @@ -5819,9 +5839,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_XYZW; } @@ -5829,9 +5849,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT; } @@ -5839,9 +5859,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_X; } @@ -5849,9 +5869,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_XY; } @@ -5859,9 +5879,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_XYZW; } @@ -5869,9 +5889,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT; } @@ -5879,9 +5899,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_X; } @@ -5889,9 +5909,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XY; } @@ -5899,9 +5919,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XYZW; } @@ -5909,9 +5929,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT; } @@ -5919,9 +5939,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_X; } @@ -5929,9 +5949,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XY; } @@ -5939,9 +5959,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XYZW; } @@ -5949,9 +5969,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT; } @@ -5959,9 +5979,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_X; } @@ -5969,9 +5989,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_XY; } @@ -5979,9 +5999,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5992,9 +6012,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR; } @@ -6003,9 +6023,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_X; } @@ -6014,9 +6034,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XY; } @@ -6025,9 +6045,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -6036,9 +6056,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_X; } @@ -6058,9 +6078,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_XY; } @@ -6069,9 +6089,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6080,9 +6100,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT; } @@ -6091,9 +6111,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_X; } @@ -6102,9 +6122,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_XY; } @@ -6113,9 +6133,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT_XYZW; } @@ -6124,9 +6144,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_X; } @@ -6146,9 +6166,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_XY; } @@ -6157,9 +6177,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_USHORT_XYZW; } @@ -6168,9 +6188,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT; } @@ -6179,9 +6199,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_X; } @@ -6190,9 +6210,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XY; } @@ -6201,9 +6221,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XYZW; } @@ -6212,9 +6232,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_X; } @@ -6234,9 +6254,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XY; } @@ -6245,9 +6265,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XYZW; } @@ -6256,9 +6276,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT; } @@ -6267,9 +6287,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_X; } @@ -6278,9 +6298,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_XY; } @@ -6289,9 +6309,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, hc::short_vector::float2(x, y).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6301,7 +6321,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR; } @@ -6309,7 +6329,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_X; } @@ -6317,7 +6337,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_XY; } @@ -6325,7 +6345,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_XYZW; } @@ -6333,7 +6353,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR; } @@ -6341,7 +6361,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_X; } @@ -6349,7 +6369,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_XY; } @@ -6357,7 +6377,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6365,7 +6385,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT; } @@ -6373,7 +6393,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_X; } @@ -6381,7 +6401,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_XY; } @@ -6389,7 +6409,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_XYZW; } @@ -6397,7 +6417,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT; } @@ -6405,7 +6425,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_X; } @@ -6413,7 +6433,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_XY; } @@ -6421,7 +6441,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_XYZW; } @@ -6429,7 +6449,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT; } @@ -6437,7 +6457,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_X; } @@ -6445,7 +6465,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_XY; } @@ -6453,7 +6473,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_XYZW; } @@ -6461,7 +6481,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT; } @@ -6469,7 +6489,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_X; } @@ -6477,7 +6497,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_XY; } @@ -6485,7 +6505,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_XYZW; } @@ -6493,7 +6513,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT; } @@ -6501,7 +6521,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_X; } @@ -6509,7 +6529,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_XY; } @@ -6517,7 +6537,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6527,7 +6547,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR; } @@ -6536,7 +6556,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_X; } @@ -6545,7 +6565,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_XY; } @@ -6554,7 +6574,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_CHAR_XYZW; } @@ -6563,7 +6583,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_X; } @@ -6581,7 +6601,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_XY; } @@ -6590,7 +6610,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6599,7 +6619,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT; } @@ -6608,7 +6628,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_X; } @@ -6617,7 +6637,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_XY; } @@ -6626,7 +6646,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_SHORT_XYZW; } @@ -6635,7 +6655,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_X; } @@ -6653,7 +6673,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_XY; } @@ -6662,7 +6682,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_USHORT_XYZW; } @@ -6670,7 +6690,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT; } @@ -6678,7 +6698,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_X; } @@ -6686,7 +6706,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_XY; } @@ -6694,7 +6714,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_INT_XYZW; } @@ -6703,7 +6723,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_X; } @@ -6721,7 +6741,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_XY; } @@ -6730,7 +6750,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_UINT_XYZW; } @@ -6739,7 +6759,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT; } @@ -6748,7 +6768,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_X; } @@ -6757,7 +6777,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_XY; } @@ -6766,7 +6786,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector()); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6776,7 +6796,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR; } @@ -6785,7 +6805,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_X; } @@ -6794,7 +6814,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_XY; } @@ -6803,7 +6823,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -6812,7 +6832,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR; } @@ -6821,7 +6841,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_X; } @@ -6830,7 +6850,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_XY; } @@ -6839,7 +6859,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6848,7 +6868,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT; } @@ -6857,7 +6877,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_X; } @@ -6866,7 +6886,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_XY; } @@ -6875,7 +6895,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_XYZW; } @@ -6884,7 +6904,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT; } @@ -6893,7 +6913,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_X; } @@ -6902,7 +6922,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_XY; } @@ -6911,7 +6931,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_XYZW; } @@ -6920,7 +6940,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT; } @@ -6929,7 +6949,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_X; } @@ -6938,7 +6958,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_XY; } @@ -6947,7 +6967,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6959,7 +6979,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR; } @@ -6969,7 +6989,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_X; } @@ -6979,7 +6999,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_XY; } @@ -6989,7 +7009,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -6999,7 +7019,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_X; } @@ -7019,7 +7039,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_XY; } @@ -7029,7 +7049,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7039,7 +7059,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT; } @@ -7049,7 +7069,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_X; } @@ -7059,7 +7079,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_XY; } @@ -7069,7 +7089,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_INT_XYZW; } @@ -7079,7 +7099,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_X; } @@ -7099,7 +7119,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_XY; } @@ -7109,7 +7129,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_UINT_XYZW; } @@ -7119,7 +7139,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT; } @@ -7129,7 +7149,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_X; } @@ -7139,7 +7159,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_XY; } @@ -7149,7 +7169,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7161,9 +7181,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR; } @@ -7172,9 +7192,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_X; } @@ -7183,9 +7203,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_XY; } @@ -7194,9 +7214,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_XYZW; } @@ -7206,9 +7226,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_X; } @@ -7228,9 +7248,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_XY; } @@ -7239,9 +7259,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7250,9 +7270,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT; } @@ -7261,9 +7281,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_X; } @@ -7272,9 +7292,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_XY; } @@ -7283,9 +7303,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_XYZW; } @@ -7295,9 +7315,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_X; } @@ -7317,9 +7337,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_XY; } @@ -7328,9 +7348,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_XYZW; } @@ -7339,9 +7359,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DGrad(texture texRef, flo float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT; } @@ -7350,9 +7370,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_X; } @@ -7361,9 +7381,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_XY; } @@ -7372,9 +7392,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_XYZW; } @@ -7383,9 +7403,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_X; } @@ -7405,9 +7425,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_XY; } @@ -7416,9 +7436,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_XYZW; } @@ -7427,9 +7447,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT; } @@ -7438,9 +7458,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_X; } @@ -7449,9 +7469,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_XY; } @@ -7460,9 +7480,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7473,9 +7493,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR; } @@ -7485,9 +7505,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_X; } @@ -7497,9 +7517,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_XY; } @@ -7509,9 +7529,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_CHAR_XYZW; } @@ -7521,9 +7541,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_X; } @@ -7545,9 +7565,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_XY; } @@ -7557,9 +7577,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7569,9 +7589,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT; } @@ -7581,9 +7601,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_X; } @@ -7593,9 +7613,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_XY; } @@ -7605,9 +7625,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_SHORT_XYZW; } @@ -7617,9 +7637,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_X; } @@ -7641,9 +7661,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_XY; } @@ -7653,9 +7673,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_USHORT_XYZW; } @@ -7665,9 +7685,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT; } @@ -7677,9 +7697,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_X; } @@ -7689,9 +7709,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_XY; } @@ -7701,9 +7721,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_INT_XYZW; } @@ -7713,9 +7733,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_X; } @@ -7737,9 +7757,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_XY; } @@ -7749,9 +7769,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_UINT_XYZW; } @@ -7761,9 +7781,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT; } @@ -7773,9 +7793,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_X; } @@ -7785,9 +7805,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_XY; } @@ -7797,9 +7817,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, hc::short_vector::float4(x, y, z, 0.0f).get_vector(), - hc::short_vector::float4(dx.x, dx.y, dx.z, dx.w).get_vector(), - hc::short_vector::float4(dy.x, dy.y, dy.z, dy.w).get_vector()); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), + float4(dx.x, dx.y, dx.z, dx.w), + float4(dy.x, dy.y, dy.z, dy.w)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7809,7 +7829,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR; } @@ -7817,7 +7837,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_X; } @@ -7825,7 +7845,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_XY; } @@ -7833,7 +7853,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_XYZW; } @@ -7841,7 +7861,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR; } @@ -7849,7 +7869,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_X; } @@ -7857,7 +7877,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_XY; } @@ -7865,7 +7885,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7873,7 +7893,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT; } @@ -7881,7 +7901,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_X; } @@ -7889,7 +7909,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_XY; } @@ -7897,7 +7917,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_XYZW; } @@ -7905,7 +7925,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayered( texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT; } @@ -7913,7 +7933,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_X; } @@ -7921,7 +7941,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_XY; } @@ -7929,7 +7949,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_XYZW; } @@ -7937,7 +7957,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT; } @@ -7945,7 +7965,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_X; } @@ -7953,7 +7973,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_XY; } @@ -7961,7 +7981,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_XYZW; } @@ -7969,7 +7989,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT; } @@ -7977,7 +7997,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_X; } @@ -7985,7 +8005,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_XY; } @@ -7993,7 +8013,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_XYZW; } @@ -8001,7 +8021,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT; } @@ -8009,7 +8029,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_X; } @@ -8017,7 +8037,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_XY; } @@ -8025,7 +8045,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8035,7 +8055,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR; } @@ -8044,7 +8064,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_X; } @@ -8053,7 +8073,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_XY; } @@ -8062,7 +8082,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_CHAR_XYZW; } @@ -8071,7 +8091,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_X; } @@ -8089,7 +8109,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_XY; } @@ -8098,7 +8118,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8107,7 +8127,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT; } @@ -8116,7 +8136,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_X; } @@ -8125,7 +8145,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_XY; } @@ -8134,7 +8154,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_SHORT_XYZW; } @@ -8143,7 +8163,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayered( texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT; } @@ -8152,7 +8172,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_X; } @@ -8161,7 +8181,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_XY; } @@ -8170,7 +8190,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_USHORT_XYZW; } @@ -8178,7 +8198,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT; } @@ -8186,7 +8206,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_X; } @@ -8194,7 +8214,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_XY; } @@ -8202,7 +8222,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_INT_XYZW; } @@ -8211,7 +8231,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_X; } @@ -8229,7 +8249,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_XY; } @@ -8238,7 +8258,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_UINT_XYZW; } @@ -8247,7 +8267,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT; } @@ -8256,7 +8276,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_X; } @@ -8265,7 +8285,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_XY; } @@ -8274,7 +8294,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, hc::short_vector::float2(x, layer).get_vector()); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8285,7 +8305,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR; } @@ -8294,7 +8314,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_X; } @@ -8303,7 +8323,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_XY; } @@ -8312,7 +8332,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -8321,7 +8341,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredLod( texture texRef, float x, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR; } @@ -8330,7 +8350,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_X; } @@ -8339,7 +8359,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_XY; } @@ -8348,7 +8368,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8357,7 +8377,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT; } @@ -8366,7 +8386,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_X; } @@ -8375,7 +8395,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_XY; } @@ -8384,7 +8404,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -8393,7 +8413,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredLod( texture texRef, float x, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_USHORT; } @@ -8402,7 +8422,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredLod(texture texRe int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT; } @@ -8438,7 +8458,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_X; } @@ -8447,7 +8467,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_XY; } @@ -8456,7 +8476,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_XYZW; } @@ -8465,7 +8485,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_X; } @@ -8483,7 +8503,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_XY; } @@ -8492,7 +8512,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_XYZW; } @@ -8501,7 +8521,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT; } @@ -8510,7 +8530,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_X; } @@ -8519,7 +8539,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_XY; } @@ -8528,7 +8548,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8540,7 +8560,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR; } @@ -8550,7 +8570,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_X; } @@ -8560,7 +8580,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_XY; } @@ -8570,7 +8590,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -8580,7 +8600,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredLod( int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR; } @@ -8590,7 +8610,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_X; } @@ -8600,7 +8620,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_XY; } @@ -8610,7 +8630,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8620,7 +8640,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT; } @@ -8630,7 +8650,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_X; } @@ -8640,7 +8660,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_XY; } @@ -8650,7 +8670,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -8660,7 +8680,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredLod( int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_USHORT; } @@ -8670,7 +8690,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredLod(texture texRe float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT; } @@ -8710,7 +8730,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_X; } @@ -8720,7 +8740,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_XY; } @@ -8730,7 +8750,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_INT_XYZW; } @@ -8740,7 +8760,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_X; } @@ -8760,7 +8780,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_XY; } @@ -8770,7 +8790,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_UINT_XYZW; } @@ -8780,7 +8800,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT; } @@ -8790,7 +8810,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_X; } @@ -8800,7 +8820,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_XY; } @@ -8810,7 +8830,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8821,7 +8841,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR; } @@ -8831,7 +8851,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR; } @@ -8840,7 +8860,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_X; } @@ -8850,7 +8870,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_X; } @@ -8859,7 +8879,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_XY; } @@ -8869,7 +8889,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_XY; } @@ -8878,7 +8898,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_XYZW; } @@ -8888,7 +8908,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_CHAR_XYZW; } @@ -8897,7 +8917,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredGrad( texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UCHAR; } @@ -8907,7 +8927,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UCHAR; } @@ -8916,7 +8936,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_SHORT; } @@ -8983,7 +9003,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_SHORT; } @@ -8992,7 +9012,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredGrad(texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_USHORT; } @@ -9059,7 +9079,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_USHORT; } @@ -9068,7 +9088,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredGrad(texture texR int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT; } @@ -9135,7 +9155,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex1DLayeredGrad(texture texR int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT; } @@ -9144,7 +9164,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_X; } @@ -9154,7 +9174,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_X; } @@ -9163,7 +9183,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_XY; } @@ -9173,7 +9193,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_XY; } @@ -9182,7 +9202,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_XYZW; } @@ -9192,7 +9212,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_INT_XYZW; } @@ -9201,7 +9221,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredGrad( texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT; } @@ -9211,7 +9231,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT; } @@ -9220,7 +9240,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_X; } @@ -9230,7 +9250,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_X; } @@ -9239,7 +9259,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_XY; } @@ -9249,7 +9269,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_XY; } @@ -9258,7 +9278,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_XYZW; } @@ -9268,7 +9288,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_UINT_XYZW; } @@ -9277,7 +9297,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_FLOAT; } @@ -9287,7 +9307,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, hc::short_vector::float2(x, layer).get_vector(), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); TEXTURE_RETURN_FLOAT; } @@ -9296,7 +9316,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredGrad(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR; } @@ -9365,7 +9385,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR; } @@ -9374,7 +9394,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_X; } @@ -9384,7 +9404,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_X; } @@ -9393,7 +9413,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_XY; } @@ -9403,7 +9423,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_XY; } @@ -9412,7 +9432,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_XYZW; } @@ -9422,7 +9442,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_CHAR_XYZW; } @@ -9431,7 +9451,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_X; } @@ -9460,7 +9480,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_X; } @@ -9469,7 +9489,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_XY; } @@ -9479,7 +9499,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_XY; } @@ -9488,7 +9508,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -9498,7 +9518,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UCHAR_XYZW; } @@ -9507,7 +9527,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT; } @@ -9517,7 +9537,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT; } @@ -9526,7 +9546,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_X; } @@ -9536,7 +9556,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_X; } @@ -9545,7 +9565,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_XY; } @@ -9555,7 +9575,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_XY; } @@ -9564,7 +9584,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_XYZW; } @@ -9574,7 +9594,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_SHORT_XYZW; } @@ -9583,7 +9603,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayered( texture texRef, float x, float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT; } @@ -9593,7 +9613,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayered( float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT; } @@ -9602,7 +9622,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_X; } @@ -9612,7 +9632,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_X; } @@ -9621,7 +9641,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_XY; } @@ -9631,7 +9651,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_XY; } @@ -9640,7 +9660,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_XYZW; } @@ -9650,7 +9670,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_USHORT_XYZW; } @@ -9659,7 +9679,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayered(texture texRef, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT; } @@ -9669,7 +9689,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayered(texture texRef, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT; } @@ -9678,7 +9698,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_X; } @@ -9688,7 +9708,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_X; } @@ -9697,7 +9717,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_XY; } @@ -9707,7 +9727,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_XY; } @@ -9716,7 +9736,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_XYZW; } @@ -9726,7 +9746,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_INT_XYZW; } @@ -9735,7 +9755,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_X; } @@ -9764,7 +9784,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_X; } @@ -9773,7 +9793,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_XY; } @@ -9783,7 +9803,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_XY; } @@ -9792,7 +9812,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_XYZW; } @@ -9802,7 +9822,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_UINT_XYZW; } @@ -9811,7 +9831,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT; } @@ -9821,7 +9841,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT; } @@ -9830,7 +9850,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_X; } @@ -9840,7 +9860,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_X; } @@ -9849,7 +9869,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_XY; } @@ -9859,7 +9879,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_XY; } @@ -9868,7 +9888,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -9878,7 +9898,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector()); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); TEXTURE_RETURN_FLOAT_XYZW; } @@ -9889,7 +9909,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR; } @@ -9899,7 +9919,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR; } @@ -9908,7 +9928,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_X; } @@ -9918,7 +9938,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_X; } @@ -9927,7 +9947,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_XY; } @@ -9937,7 +9957,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_XY; } @@ -9946,7 +9966,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -9956,7 +9976,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_CHAR_XYZW; } @@ -9965,7 +9985,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredLod( texture texRef, float x, float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR; } @@ -9975,7 +9995,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredLod( float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR; } @@ -9984,7 +10004,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_X; } @@ -9994,7 +10014,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_X; } @@ -10003,7 +10023,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_XY; } @@ -10013,7 +10033,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_XY; } @@ -10022,7 +10042,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -10032,7 +10052,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -10041,7 +10061,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT; } @@ -10051,7 +10071,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT; } @@ -10060,7 +10080,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_X; } @@ -10070,7 +10090,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_X; } @@ -10079,7 +10099,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_XY; } @@ -10089,7 +10109,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_XY; } @@ -10098,7 +10118,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -10108,7 +10128,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_SHORT_XYZW; } @@ -10117,7 +10137,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayeredLod( texture texRef, float x, float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_USHORT; } @@ -10127,7 +10147,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayeredLod( float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_USHORT; } @@ -10136,7 +10156,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayeredLod(texture texRe int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT; } @@ -10203,7 +10223,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayeredLod(texture texRe int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT; } @@ -10212,7 +10232,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_X; } @@ -10222,7 +10242,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_X; } @@ -10231,7 +10251,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_XY; } @@ -10241,7 +10261,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_XY; } @@ -10250,7 +10270,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_XYZW; } @@ -10260,7 +10280,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_INT_XYZW; } @@ -10269,7 +10289,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_X; } @@ -10298,7 +10318,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_X; } @@ -10307,7 +10327,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_XY; } @@ -10317,7 +10337,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_XY; } @@ -10326,7 +10346,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_XYZW; } @@ -10336,7 +10356,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_UINT_XYZW; } @@ -10345,7 +10365,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT; } @@ -10355,7 +10375,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT; } @@ -10364,7 +10384,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_X; } @@ -10374,7 +10394,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_X; } @@ -10383,7 +10403,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_XY; } @@ -10393,7 +10413,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_XY; } @@ -10402,7 +10422,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -10412,7 +10432,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), level); + i, s, float4(x, y, layer, 0.0f), level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -10423,9 +10443,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR; } @@ -10435,9 +10455,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR; } @@ -10446,9 +10466,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_X; } @@ -10458,9 +10478,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_X; } @@ -10469,9 +10489,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XY; } @@ -10481,9 +10501,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XY; } @@ -10492,9 +10512,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -10504,9 +10524,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_CHAR_XYZW; } @@ -10516,9 +10536,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredGrad( float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR; } @@ -10528,9 +10548,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredGrad( float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UCHAR; } @@ -10539,9 +10559,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT; } @@ -10620,9 +10640,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_SHORT; } @@ -10631,9 +10651,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredGrad(texture texR float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT; } @@ -10805,9 +10825,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayeredGrad(texture texR int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT; } @@ -10816,9 +10836,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_X; } @@ -10828,9 +10848,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_X; } @@ -10839,9 +10859,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XY; } @@ -10851,9 +10871,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XY; } @@ -10862,9 +10882,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XYZW; } @@ -10874,9 +10894,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_INT_XYZW; } @@ -10886,9 +10906,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredGrad( float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT; } @@ -10898,9 +10918,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredGrad( int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT; } @@ -10909,9 +10929,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_X; } @@ -10921,9 +10941,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_X; } @@ -10932,9 +10952,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XY; } @@ -10944,9 +10964,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XY; } @@ -10955,9 +10975,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XYZW; } @@ -10967,9 +10987,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_UINT_XYZW; } @@ -10978,9 +10998,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT; } @@ -10990,9 +11010,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, hc::short_vector::float4(x, y, layer, 0.0f).get_vector(), - hc::short_vector::float2(dx.x, dx.y).get_vector(), - hc::short_vector::float2(dy.x, dy.y).get_vector()); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), + float2(dx.x, dx.y), + float2(dy.x, dy.y)); TEXTURE_RETURN_FLOAT; } @@ -11001,9 +11021,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredGrad(texture Date: Fri, 27 Jul 2018 09:29:29 -0700 Subject: [PATCH 21/29] Drop use of NVCC_COMPAT since it is always set [ROCm/hip commit: 71f96388ede083efce1cc43e2704b05ad8626136] --- .../include/hip/hcc_detail/device_functions.h | 41 ------------------- .../hip/include/hip/hcc_detail/hip_runtime.h | 2 - .../hip/tests/src/deviceLib/hip_anyall.cpp | 13 ------ projects/hip/tests/src/deviceLib/hip_clz.cpp | 9 ---- projects/hip/tests/src/deviceLib/hip_ffs.cpp | 8 ---- 5 files changed, 73 deletions(-) diff --git a/projects/hip/include/hip/hcc_detail/device_functions.h b/projects/hip/include/hip/hcc_detail/device_functions.h index 6455fa6cd1..5e1c8a4e6b 100644 --- a/projects/hip/include/hip/hcc_detail/device_functions.h +++ b/projects/hip/include/hip/hcc_detail/device_functions.h @@ -48,69 +48,35 @@ __device__ static inline unsigned int __popcll(unsigned long long int input) { } __device__ static inline unsigned int __clz(unsigned int input) { -#ifdef NVCC_COMPAT return input == 0 ? 32 : __builtin_clz(input); -#else - return input == 0 ? -1 : __builtin_clz(input); -#endif } __device__ static inline unsigned int __clzll(unsigned long long int input) { -#ifdef NVCC_COMPAT return input == 0 ? 64 : ( input == 0 ? -1 : __builtin_clzl(input) ); -#else - return input == 0 ? -1 : __builtin_clzl(input); -#endif } __device__ static inline unsigned int __clz(int input) { -#ifdef NVCC_COMPAT return input == 0 ? 32 : ( input > 0 ? __builtin_clz(input) : __builtin_clz(~input) ); -#else - if (input == 0) return -1; - return input > 0 ? __builtin_clz(input) : __builtin_clz(~input); -#endif } __device__ static inline unsigned int __clzll(long long int input) { -#ifdef NVCC_COMPAT return input == 0 ? 64 : input > 0 ? __builtin_clzl(input) : __builtin_clzl(~input); -#else - if (input == 0) return -1; - return input > 0 ? __builtin_clzl(input) : __builtin_clzl(~input); -#endif } __device__ static inline unsigned int __ffs(unsigned int input) { -#ifdef NVCC_COMPAT return ( input == 0 ? -1 : __builtin_ctz(input) ) + 1; -#else - return input == 0 ? -1 : __builtin_ctz(input); -#endif } __device__ static inline unsigned int __ffsll(unsigned long long int input) { -#ifdef NVCC_COMPAT return ( input == 0 ? -1 : __builtin_ctzl(input) ) + 1; -#else - return input == 0 ? -1 : __builtin_ctzl(input); -#endif } __device__ static inline unsigned int __ffs(int input) { -#ifdef NVCC_COMPAT return ( input == 0 ? -1 : __builtin_ctz(input) ) + 1; -#else - return input == 0 ? -1 : __builtin_ctz(input); -#endif } __device__ static inline unsigned int __ffsll(long long int input) { -#ifdef NVCC_COMPAT return ( input == 0 ? -1 : __builtin_ctzl(input) ) + 1; -#else - return input == 0 ? -1 : __builtin_ctzl(input); -#endif } __device__ static inline unsigned int __brev(unsigned int input) { return __llvm_bitrev_b32(input); } @@ -673,14 +639,7 @@ int __all(int predicate) { __device__ inline int __any(int predicate) { -#ifdef NVCC_COMPAT - if (__ockl_wfany_i32(predicate) != 0) - return 1; - else - return 0; -#else return __ockl_wfany_i32(predicate); -#endif } // XXX from llvm/include/llvm/IR/InstrTypes.h diff --git a/projects/hip/include/hip/hcc_detail/hip_runtime.h b/projects/hip/include/hip/hcc_detail/hip_runtime.h index c2ae6e8e4f..17f987a745 100644 --- a/projects/hip/include/hip/hcc_detail/hip_runtime.h +++ b/projects/hip/include/hip/hcc_detail/hip_runtime.h @@ -57,8 +57,6 @@ THE SOFTWARE. #if __HCC_OR_HIP_CLANG__ -// Define NVCC_COMPAT for CUDA compatibility -#define NVCC_COMPAT #define CUDA_SUCCESS hipSuccess #include diff --git a/projects/hip/tests/src/deviceLib/hip_anyall.cpp b/projects/hip/tests/src/deviceLib/hip_anyall.cpp index 21ad9f871c..934c4dbcfd 100644 --- a/projects/hip/tests/src/deviceLib/hip_anyall.cpp +++ b/projects/hip/tests/src/deviceLib/hip_anyall.cpp @@ -86,28 +86,15 @@ int main(int argc, char* argv[]) { printf("warp no. %d __all = %d \n", i, host_all[i]); if (host_all[i] != 1) ++allcount; -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - if (host_any[i] != 64) ++anycount; -#else if (host_any[i] != 1) ++anycount; -#endif } -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - if (anycount == 1 && allcount == 1) - printf("PASSED\n"); - else { - printf("FAILED\n"); - return EXIT_FAILURE; - } -#else if (anycount == 0 && allcount == 1) printf("PASSED\n"); else { printf("FAILED\n"); return EXIT_FAILURE; } -#endif return EXIT_SUCCESS; } diff --git a/projects/hip/tests/src/deviceLib/hip_clz.cpp b/projects/hip/tests/src/deviceLib/hip_clz.cpp index 6f3ed33a39..985da04967 100644 --- a/projects/hip/tests/src/deviceLib/hip_clz.cpp +++ b/projects/hip/tests/src/deviceLib/hip_clz.cpp @@ -45,12 +45,7 @@ THE SOFTWARE. unsigned int firstbit_u32(unsigned int a) { if (a == 0) { -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - - return -1; -#else return 32; -#endif } unsigned int pos = 0; while ((int)a > 0) { @@ -62,11 +57,7 @@ unsigned int firstbit_u32(unsigned int a) { unsigned int firstbit_u64(unsigned long long int a) { if (a == 0) { -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - return -1; -#else return 64; -#endif } unsigned int pos = 0; while ((long long int)a > 0) { diff --git a/projects/hip/tests/src/deviceLib/hip_ffs.cpp b/projects/hip/tests/src/deviceLib/hip_ffs.cpp index 220c742464..04cf38caa8 100644 --- a/projects/hip/tests/src/deviceLib/hip_ffs.cpp +++ b/projects/hip/tests/src/deviceLib/hip_ffs.cpp @@ -49,21 +49,13 @@ THE SOFTWARE. template int lastbit(T a) { if (a == 0) -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - return -1; -#else return 0; -#endif int pos = 1; while ((a & 1) != 1) { a >>= 1; pos++; } -#if defined(__HIP_PLATFORM_HCC__) && !defined(NVCC_COMPAT) - return pos - 1; -#else return pos; -#endif } From baa29eb5d75d0219ebac6997bbf7bf14a2953e7c Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Sat, 28 Jul 2018 21:00:44 +0300 Subject: [PATCH 22/29] [HIPIFY][BLAS] cuBLAS support revise + doc for CUBLAS API supported by HIP + 3 tests: 0 & 1 based indexing, sgemm matmul [ROCm/hip commit: 92eb165875e0493e7714a0c97c6dbd9f44bbeb51] --- .../markdown/CUBLAS_API_supported_by_HIP.md | 516 ++++++++++ projects/hip/hipify-clang/src/CUDA2HipMap.cpp | 915 +++++++++--------- .../cuBLAS/cublas_0_based_indexing.cu | 79 ++ .../cuBLAS/cublas_1_based_indexing.cu | 90 ++ .../cublas_sgemm_matrix_multiplication.cu | 108 +++ 5 files changed, 1263 insertions(+), 445 deletions(-) create mode 100644 projects/hip/docs/markdown/CUBLAS_API_supported_by_HIP.md create mode 100644 projects/hip/tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu create mode 100644 projects/hip/tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu create mode 100644 projects/hip/tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu diff --git a/projects/hip/docs/markdown/CUBLAS_API_supported_by_HIP.md b/projects/hip/docs/markdown/CUBLAS_API_supported_by_HIP.md new file mode 100644 index 0000000000..932092612b --- /dev/null +++ b/projects/hip/docs/markdown/CUBLAS_API_supported_by_HIP.md @@ -0,0 +1,516 @@ +# CUBLAS API supported by HIP + +## **1. CUBLAS Data types** + +| **type** | **CUDA** | **HIP** |**HIP value** (if differs) | +|-------------:|---------------------------------------------------------------|------------------------------------------------------------|---------------------------| +| enum |***`cublasStatus`*** |***`hipblasStatus_t`*** | +| enum |***`cublasStatus_t`*** |***`hipblasStatus_t`*** | +| 0 |*`CUBLAS_STATUS_SUCCESS`* |*`HIPBLAS_STATUS_SUCCESS`* | +| 1 |*`CUBLAS_STATUS_NOT_INITIALIZED`* |*`HIPBLAS_STATUS_NOT_INITIALIZED`* | +| 3 |*`CUBLAS_STATUS_ALLOC_FAILED`* |*`HIPBLAS_STATUS_ALLOC_FAILED`* | 2 | +| 7 |*`CUBLAS_STATUS_INVALID_VALUE`* |*`HIPBLAS_STATUS_INVALID_VALUE`* | 3 | +| 8 |*`CUBLAS_STATUS_ARCH_MISMATCH`* |*`HIPBLAS_STATUS_ARCH_MISMATCH`* | | +| 11 |*`CUBLAS_STATUS_MAPPING_ERROR`* |*`HIPBLAS_STATUS_MAPPING_ERROR`* | 4 | +| 13 |*`CUBLAS_STATUS_EXECUTION_FAILED`* |*`HIPBLAS_STATUS_EXECUTION_FAILED`* | 5 | +| 14 |*`CUBLAS_STATUS_INTERNAL_ERROR`* |*`HIPBLAS_STATUS_INTERNAL_ERROR`* | 6 | +| 15 |*`CUBLAS_STATUS_NOT_SUPPORTED`* |*`HIPBLAS_STATUS_NOT_SUPPORTED`* | 7 | +| 16 |*`CUBLAS_STATUS_LICENSE_ERROR`* | | +| enum |***`cublasOperation_t`*** |***`hipblasOperation_t`*** | +| 0 |*`CUBLAS_OP_N`* |*`HIPBLAS_OP_N`* | 111 | +| 1 |*`CUBLAS_OP_T`* |*`HIPBLAS_OP_T`* | 112 | +| 2 |*`CUBLAS_OP_C`* |*`HIPBLAS_OP_C`* | 113 | +| enum |***`cublasFillMode_t`*** |***`hipblasFillMode_t`*** | +| 0 |*`CUBLAS_FILL_MODE_LOWER`* |*`HIPBLAS_FILL_MODE_LOWER`* | 121 | +| 1 |*`CUBLAS_FILL_MODE_UPPER`* |*`HIPBLAS_FILL_MODE_UPPER`* | 122 | +| enum |***`cublasDiagType_t`*** |***`hipblasDiagType_t`*** | +| 0 |*`CUBLAS_DIAG_NON_UNIT`* |*`HIPBLAS_DIAG_NON_UNIT`* | 131 | +| 1 |*`CUBLAS_DIAG_UNIT`* |*`HIPBLAS_DIAG_UNIT`* | 132 | +| enum |***`cublasSideMode_t`*** |***`hipblasSideMode_t`*** | +| 0 |*`CUBLAS_SIDE_LEFT`* |*`HIPBLAS_SIDE_LEFT`* | 141 | +| 1 |*`CUBLAS_SIDE_RIGHT`* |*`HIPBLAS_SIDE_RIGHT`* | 142 | +| enum |***`cublasPointerMode_t`*** |***`hipblasPointerMode_t`*** | +| 0 |*`CUBLAS_POINTER_MODE_HOST`* |*`HIPBLAS_POINTER_MODE_HOST`* | +| 1 |*`CUBLAS_POINTER_MODE_DEVICE`* |*`HIPBLAS_POINTER_MODE_DEVICE`* | +| enum |***`cublasAtomicsMode_t`*** | | +| 0 |*`CUBLAS_ATOMICS_NOT_ALLOWED`* | | +| 1 |*`CUBLAS_ATOMICS_ALLOWED`* | | +| enum |***`cublasAtomicsMode_t`*** | | +| -1 |*`CUBLAS_GEMM_DFALT`* | | +| -1 |*`CUBLAS_GEMM_DEFAULT`* | | +| 0 |*`CUBLAS_GEMM_ALGO0`* | | +| 1 |*`CUBLAS_GEMM_ALGO1`* | | +| 2 |*`CUBLAS_GEMM_ALGO2`* | | +| 3 |*`CUBLAS_GEMM_ALGO3`* | | +| 4 |*`CUBLAS_GEMM_ALGO4`* | | +| 5 |*`CUBLAS_GEMM_ALGO5`* | | +| 6 |*`CUBLAS_GEMM_ALGO6`* | | +| 7 |*`CUBLAS_GEMM_ALGO7`* | | +| 8 |*`CUBLAS_GEMM_ALGO8`* | | +| 9 |*`CUBLAS_GEMM_ALGO9`* | | +| 10 |*`CUBLAS_GEMM_ALGO10`* | | +| 11 |*`CUBLAS_GEMM_ALGO11`* | | +| 12 |*`CUBLAS_GEMM_ALGO12`* | | +| 13 |*`CUBLAS_GEMM_ALGO13`* | | +| 14 |*`CUBLAS_GEMM_ALGO14`* | | +| 15 |*`CUBLAS_GEMM_ALGO15`* | | +| 16 |*`CUBLAS_GEMM_ALGO16`* | | +| 17 |*`CUBLAS_GEMM_ALGO17`* | | +| 18 |*`CUBLAS_GEMM_ALGO18`* | | +| 19 |*`CUBLAS_GEMM_ALGO19`* | | +| 20 |*`CUBLAS_GEMM_ALGO20`* | | +| 21 |*`CUBLAS_GEMM_ALGO21`* | | +| 22 |*`CUBLAS_GEMM_ALGO22`* | | +| 23 |*`CUBLAS_GEMM_ALGO23`* | | +| 99 |*`CUBLAS_GEMM_DEFAULT_TENSOR_OP`* | | +| 99 |*`CUBLAS_GEMM_DFALT_TENSOR_OP`* | | +| 100 |*`CUBLAS_GEMM_ALGO0_TENSOR_OP`* | | +| 101 |*`CUBLAS_GEMM_ALGO1_TENSOR_OP`* | | +| 102 |*`CUBLAS_GEMM_ALGO2_TENSOR_OP`* | | +| 103 |*`CUBLAS_GEMM_ALGO3_TENSOR_OP`* | | +| 104 |*`CUBLAS_GEMM_ALGO4_TENSOR_OP`* | | +| 105 |*`CUBLAS_GEMM_ALGO5_TENSOR_OP`* | | +| 106 |*`CUBLAS_GEMM_ALGO6_TENSOR_OP`* | | +| 107 |*`CUBLAS_GEMM_ALGO7_TENSOR_OP`* | | +| 108 |*`CUBLAS_GEMM_ALGO8_TENSOR_OP`* | | +| 109 |*`CUBLAS_GEMM_ALGO9_TENSOR_OP`* | | +| 110 |*`CUBLAS_GEMM_ALGO10_TENSOR_OP`* | | +| 111 |*`CUBLAS_GEMM_ALGO11_TENSOR_OP`* | | +| 112 |*`CUBLAS_GEMM_ALGO12_TENSOR_OP`* | | +| 113 |*`CUBLAS_GEMM_ALGO13_TENSOR_OP`* | | +| 114 |*`CUBLAS_GEMM_ALGO14_TENSOR_OP`* | | +| 115 |*`CUBLAS_GEMM_ALGO15_TENSOR_OP`* | | +| enum |***`cublasMath_t`*** | | +| 0 |*`CUBLAS_DEFAULT_MATH`* | | +| 1 |*`CUBLAS_TENSOR_OP_MATH`* | | +| enum* |`cublasDataType_t` | | +| struct |`cublasContext` | | +| struct* |`cublasHandle_t` |`hipblasHandle_t` | + +## **2. CUBLAS API functions** + +| **CUDA** | **HIP** | +|-----------------------------------------------------------|-------------------------------------------------| +|`cublasCreate` |`hipblasCreate` | +|`cublasCreate_v2` |`hipblasCreate` | +|`cublasDestroy` |`hipblasDestroy` | +|`cublasDestroy_v2` |`hipblasDestroy` | +|`cublasGetVersion` | | +|`cublasGetVersion_v2` | | +|`cublasGetProperty` | | +|`cublasGetStream` |`hipblasGetStream` | +|`cublasGetStream_v2` |`hipblasGetStream_v2` | +|`cublasSetStream` |`hipblasSetStream` | +|`cublasSetStream_v2` |`hipblasSetStream_v2` | +|`cublasGetPointerMode` |`hipblasGetPointerMode` | +|`cublasGetPointerMode_v2` |`hipblasGetPointerMode_v2` | +|`cublasSetPointerMode` |`hipblasSetPointerMode` | +|`cublasSetPointerMode_v2` |`hipblasSetPointerMode_v2` | +|`cublasGetAtomicsMode` | | +|`cublasSetAtomicsMode` | | +|`cublasGetMathMode` | | +|`cublasSetMathMode` | | +|`cublasLogCallback` | | +|`cublasLoggerConfigure` | | +|`cublasSetLoggerCallback` | | +|`cublasGetLoggerCallback` | | +|`cublasSetVector` |`hipblasSetVector` | +|`cublasGetVector` |`hipblasGetVector` | +|`cublasSetMatrix` |`hipblasSetMatrix` | +|`cublasGetMatrix` |`hipblasGetMatrix` | +|`cublasSetVectorAsync` | | +|`cublasGetVectorAsync` | | +|`cublasSetMatrixAsync` | | +|`cublasGetMatrixAsync` | | +|`cublasXerbla` | | +|`cublasNrm2Ex` | | +|`cublasSnrm2` |`hipblasSnrm2` | +|`cublasSnrm2_v2` |`hipblasSnrm2` | +|`cublasDnrm2` |`hipblasDnrm2` | +|`cublasDnrm2_v2` |`hipblasDnrm2` | +|`cublasScnrm2` | | +|`cublasScnrm2_v2` | | +|`cublasDznrm2` | | +|`cublasDznrm2_v2` | | +|`cublasDotEx` | | +|`cublasDotcEx` | | +|`cublasSdot` |`hipblasSdot` | +|`cublasSdot_v2` |`hipblasSdot` | +|`cublasDdot` |`hipblasDdot` | +|`cublasDdot_v2` |`hipblasDdot` | +|`cublasCdotu` | | +|`cublasCdotu_v2` | | +|`cublasCdotc` | | +|`cublasCdotc_v2` | | +|`cublasZdotu` | | +|`cublasZdotu_v2` | | +|`cublasZdotc` | | +|`cublasZdotc_v2` | | +|`cublasScalEx` | | +|`cublasSscal` |`hipblasSscal` | +|`cublasSscal_v2` |`hipblasSscal` | +|`cublasDscal` |`hipblasDscal` | +|`cublasDscal_v2` |`hipblasDscal` | +|`cublasCscal` | | +|`cublasCscal_v2` | | +|`cublasCsscal` | | +|`cublasCsscal_v2` | | +|`cublasZscal` | | +|`cublasZscal_v2` | | +|`cublasZdscal` | | +|`cublasZdscal_v2` | | +|`cublasAxpyEx` | | +|`cublasSaxpy` |`hipblasSaxpy` | +|`cublasSaxpy_v2` |`hipblasSaxpy` | +|`cublasDaxpy` |`hipblasDaxpy` | +|`cublasDaxpy_v2` |`hipblasDaxpy` | +|`cublasCaxpy` | | +|`cublasCaxpy_v2` | | +|`cublasZaxpy` | | +|`cublasZaxpy_v2` | | +|`cublasScopy` |`hipblasScopy` | +|`cublasScopy_v2` |`hipblasScopy` | +|`cublasDcopy` |`hipblasDcopy` | +|`cublasDcopy_v2` |`hipblasDcopy` | +|`cublasCcopy` | | +|`cublasCcopy_v2` | | +|`cublasZcopy` | | +|`cublasZcopy_v2` | | +|`cublasSswap` | | +|`cublasSswap_v2` | | +|`cublasDswap` | | +|`cublasDswap_v2` | | +|`cublasCswap` | | +|`cublasCswap_v2` | | +|`cublasZswap` | | +|`cublasZswap_v2` | | +|`cublasIsamax` |`hipblasIsamax` | +|`cublasIsamax_v2` |`hipblasIsamax` | +|`cublasIdamax` |`hipblasIdamax` | +|`cublasIdamax_v2` |`hipblasIdamax` | +|`cublasIcamax` | | +|`cublasIcamax_v2` | | +|`cublasIzamax` | | +|`cublasIzamax_v2` | | +|`cublasIsamin` | | +|`cublasIsamin_v2` | | +|`cublasIdamin` | | +|`cublasIdamin_v2` | | +|`cublasIcamin` | | +|`cublasIcamin_v2` | | +|`cublasIzamin` | | +|`cublasIzamin_v2` | | +|`cublasSasum` |`hipblasSasum` | +|`cublasSasum_v2` |`hipblasSasum` | +|`cublasDasum` |`hipblasDasum` | +|`cublasDasum_v2` |`hipblasDasum` | +|`cublasScasum` | | +|`cublasScasum_v2` | | +|`cublasDzasum` | | +|`cublasDzasum_v2` | | +|`cublasSrot` | | +|`cublasSrot_v2` | | +|`cublasDrot` | | +|`cublasDrot_v2` | | +|`cublasCrot` | | +|`cublasCrot_v2` | | +|`cublasZrot` | | +|`cublasZrot_v2` | | +|`cublasZdrot` | | +|`cublasZdrot_v2` | | +|`cublasSrotg` | | +|`cublasSrotg_v2` | | +|`cublasDrotg` | | +|`cublasDrotg_v2` | | +|`cublasCrotg` | | +|`cublasCrotg_v2` | | +|`cublasZrotg` | | +|`cublasZrotg_v2` | | +|`cublasSrotm` | | +|`cublasSrotm_v2` | | +|`cublasDrotm` | | +|`cublasDrotm_v2` | | +|`cublasSrotmg` | | +|`cublasSrotmg_v2` | | +|`cublasDrotmg` | | +|`cublasDrotmg_v2` | | +|`cublasSgemv` |`hipblasSgemv` | +|`cublasSgemv_v2` |`hipblasSgemv` | +|`cublasDgemv` |`hipblasDgemv` | +|`cublasDgemv_v2` |`hipblasDgemv` | +|`cublasCgemv` | | +|`cublasCgemv_v2` | | +|`cublasZgemv` | | +|`cublasZgemv_v2` | | +|`cublasSgbmv` | | +|`cublasSgbmv_v2` | | +|`cublasDgbmv` | | +|`cublasDgbmv_v2` | | +|`cublasCgbmv` | | +|`cublasCgbmv_v2` | | +|`cublasZgbmv` | | +|`cublasZgbmv_v2` | | +|`cublasStrmv` | | +|`cublasStrmv_v2` | | +|`cublasDtrmv` | | +|`cublasDtrmv_v2` | | +|`cublasCtrmv` | | +|`cublasCtrmv_v2` | | +|`cublasZtrmv` | | +|`cublasZtrmv_v2` | | +|`cublasStbmv` | | +|`cublasStbmv_v2` | | +|`cublasDtbmv` | | +|`cublasDtbmv_v2` | | +|`cublasCtbmv` | | +|`cublasCtbmv_v2` | | +|`cublasZtbmv` | | +|`cublasZtbmv_v2` | | +|`cublasStpmv` | | +|`cublasStpmv_v2` | | +|`cublasDtpmv` | | +|`cublasDtpmv_v2` | | +|`cublasCtpmv` | | +|`cublasCtpmv_v2` | | +|`cublasZtpmv` | | +|`cublasZtpmv_v2` | | +|`cublasStrsv` | | +|`cublasStrsv_v2` | | +|`cublasDtrsv` | | +|`cublasDtrsv_v2` | | +|`cublasCtrsv` | | +|`cublasCtrsv_v2` | | +|`cublasZtrsv` | | +|`cublasZtrsv_v2` | | +|`cublasStpsv` | | +|`cublasStpsv_v2` | | +|`cublasDtpsv` | | +|`cublasDtpsv_v2` | | +|`cublasCtpsv` | | +|`cublasCtpsv_v2` | | +|`cublasZtpsv` | | +|`cublasZtpsv_v2` | | +|`cublasStbsv` | | +|`cublasStbsv_v2` | | +|`cublasDtbsv` | | +|`cublasDtbsv_v2` | | +|`cublasCtbsv` | | +|`cublasCtbsv_v2` | | +|`cublasZtbsv` | | +|`cublasZtbsv_v2` | | +|`cublasSsymv` | | +|`cublasSsymv_v2` | | +|`cublasDsymv` | | +|`cublasDsymv_v2` | | +|`cublasCsymv` | | +|`cublasCsymv_v2` | | +|`cublasZsymv` | | +|`cublasZsymv_v2` | | +|`cublasChemv` | | +|`cublasChemv_v2` | | +|`cublasZhemv` | | +|`cublasZhemv_v2` | | +|`cublasSsbmv` | | +|`cublasSsbmv_v2` | | +|`cublasDsbmv` | | +|`cublasDsbmv_v2` | | +|`cublasChbmv` | | +|`cublasChbmv_v2` | | +|`cublasZhbmv` | | +|`cublasZhbmv_v2` | | +|`cublasSspmv` | | +|`cublasSspmv_v2` | | +|`cublasDspmv` | | +|`cublasDspmv_v2` | | +|`cublasChpmv` | | +|`cublasChpmv_v2` | | +|`cublasZhpmv` | | +|`cublasZhpmv_v2` | | +|`cublasSger` |`hipblasSger` | +|`cublasSger_v2` |`hipblasSger` | +|`cublasDger` |`hipblasDger` | +|`cublasDger_v2` |`hipblasDger` | +|`cublasCgeru` | | +|`cublasCgeru_v2` | | +|`cublasCgerc` | | +|`cublasCgerc_v2` | | +|`cublasZgeru` | | +|`cublasZgeru_v2` | | +|`cublasZgerc` | | +|`cublasZgerc_v2` | | +|`cublasSsyr` | | +|`cublasSsyr_v2` | | +|`cublasDsyr` | | +|`cublasDsyr_v2` | | +|`cublasCsyr` | | +|`cublasCsyr_v2` | | +|`cublasZsyr` | | +|`cublasZsyr_v2` | | +|`cublasCher` | | +|`cublasCher_v2` | | +|`cublasZher` | | +|`cublasZher_v2` | | +|`cublasSspr` | | +|`cublasSspr_v2` | | +|`cublasDspr` | | +|`cublasDspr_v2` | | +|`cublasChpr` | | +|`cublasChpr_v2` | | +|`cublasZhpr` | | +|`cublasZhpr_v2` | | +|`cublasSsyr2` | | +|`cublasSsyr2_v2` | | +|`cublasDsyr2` | | +|`cublasDsyr2_v2` | | +|`cublasCsyr2` | | +|`cublasCsyr2_v2` | | +|`cublasZsyr2` | | +|`cublasZsyr2_v2` | | +|`cublasCher2` | | +|`cublasCher2_v2` | | +|`cublasZher2` | | +|`cublasZher2_v2` | | +|`cublasSspr2` | | +|`cublasSspr2_v2` | | +|`cublasDspr2` | | +|`cublasDspr2_v2` | | +|`cublasChpr2` | | +|`cublasChpr2_v2` | | +|`cublasZhpr2` | | +|`cublasZhpr2_v2` | | +|`cublasSgemm` |`hipblasSgemm` | +|`cublasSgemm_v2` |`hipblasSgemm` | +|`cublasDgemm` |`hipblasDgemm` | +|`cublasDgemm_v2` |`hipblasDgemm` | +|`cublasCgemm` |`hipblasCgemm` | +|`cublasCgemm_v2` |`hipblasCgemm` | +|`cublasCgemm3m` | | +|`cublasCgemm3mEx` | | +|`cublasZgemm` | | +|`cublasZgemm_v2` | | +|`cublasZgemm3m` | | +|`cublasHgemm` |`hipblasHgemm` | +|`cublasSgemmEx` | | +|`cublasGemmEx` | | +|`cublasCgemmEx` | | +|`cublasUint8gemmBias` | | +|`cublasSsyrk` | | +|`cublasSsyrk_v2` | | +|`cublasDsyrk` | | +|`cublasDsyrk_v2` | | +|`cublasCsyrk` | | +|`cublasCsyrk_v2` | | +|`cublasZsyrk` | | +|`cublasZsyrk_v2` | | +|`cublasCsyrkEx` | | +|`cublasCsyrk3mEx` | | +|`cublasCherk` | | +|`cublasCherk_v2` | | +|`cublasZherk` | | +|`cublasZherk_v2` | | +|`cublasCherkEx` | | +|`cublasCherk3mEx` | | +|`cublasSsyr2k` | | +|`cublasSsyr2k_v2` | | +|`cublasDsyr2k` | | +|`cublasDsyr2k_v2` | | +|`cublasCsyr2k` | | +|`cublasCsyr2k_v2` | | +|`cublasZsyr2k` | | +|`cublasZsyr2k_v2` | | +|`cublasCher2k` | | +|`cublasCher2k_v2` | | +|`cublasZher2k` | | +|`cublasZher2k_v2` | | +|`cublasSsyrkx` | | +|`cublasDsyrkx` | | +|`cublasCsyrkx` | | +|`cublasZsyrkx` | | +|`cublasCherkx` | | +|`cublasZherkx` | | +|`cublasSsymm` | | +|`cublasSsymm_v2` | | +|`cublasDsymm` | | +|`cublasDsymm_v2` | | +|`cublasCsymm` | | +|`cublasCsymm_v2` | | +|`cublasZsymm` | | +|`cublasZsymm_v2` | | +|`cublasChemm` | | +|`cublasChemm_v2` | | +|`cublasZhemm` | | +|`cublasZhemm_v2` | | +|`cublasStrsm` |`hipblasStrsm` | +|`cublasStrsm_v2` |`hipblasStrsm` | +|`cublasDtrsm` |`hipblasDtrsm` | +|`cublasDtrsm_v2` |`hipblasDtrsm` | +|`cublasCtrsm` | | +|`cublasCtrsm_v2` | | +|`cublasZtrsm` | | +|`cublasZtrsm_v2` | | +|`cublasStrmm` | | +|`cublasStrmm_v2` | | +|`cublasDtrmm` | | +|`cublasDtrmm_v2` | | +|`cublasCtrmm` | | +|`cublasCtrmm_v2` | | +|`cublasZtrmm` | | +|`cublasZtrmm_v2` | | +|`cublasHgemmBatched` | | +|`cublasSgemmBatched` |`hipblasSgemmBatched` | +|`cublasDgemmBatched` |`hipblasDgemmBatched` | +|`cublasCgemmBatched` | | +|`cublasCgemm3mBatched` | | +|`cublasZgemmBatched` | | +|`cublasGemmBatchedEx` | | +|`cublasGemmStridedBatchedEx` | | +|`cublasSgemmStridedBatched` | | +|`cublasDgemmStridedBatched` | | +|`cublasCgemmStridedBatched` | | +|`cublasCgemm3mStridedBatched` | | +|`cublasZgemmStridedBatched` | | +|`cublasHgemmStridedBatched` | | +|`cublasSgeam` |`hipblasSgeam` | +|`cublasDgeam` |`hipblasDgeam` | +|`cublasCgeam` | | +|`cublasZgeam` | | +|`cublasSgetrfBatched` | | +|`cublasDgetrfBatched` | | +|`cublasCgetrfBatched` | | +|`cublasZgetrfBatched` | | +|`cublasSgetriBatched` | | +|`cublasDgetriBatched` | | +|`cublasCgetriBatched` | | +|`cublasZgetriBatched` | | +|`cublasSgetrsBatched` | | +|`cublasDgetrsBatched` | | +|`cublasCgetrsBatched` | | +|`cublasZgetrsBatched` | | +|`cublasStrsmBatched` | | +|`cublasDtrsmBatched` | | +|`cublasCtrsmBatched` | | +|`cublasZtrsmBatched` | | +|`cublasSmatinvBatched` | | +|`cublasDmatinvBatched` | | +|`cublasCmatinvBatched` | | +|`cublasZmatinvBatched` | | +|`cublasSgeqrfBatched` | | +|`cublasDgeqrfBatched` | | +|`cublasCgeqrfBatched` | | +|`cublasZgeqrfBatched` | | +|`cublasSgelsBatched` | | +|`cublasDgelsBatched` | | +|`cublasCgelsBatched` | | +|`cublasZgelsBatched` | | +|`cublasSdgmm` | | +|`cublasDdgmm` | | +|`cublasCdgmm` | | +|`cublasZdgmm` | | +|`cublasStpttr` | | +|`cublasDtpttr` | | +|`cublasCtpttr` | | +|`cublasZtpttr` | | +|`cublasStrttp` | | +|`cublasDtrttp` | | +|`cublasCtrttp` | | +|`cublasZtrttp` | | diff --git a/projects/hip/hipify-clang/src/CUDA2HipMap.cpp b/projects/hip/hipify-clang/src/CUDA2HipMap.cpp index 9939e8d913..63c294ac34 100644 --- a/projects/hip/hipify-clang/src/CUDA2HipMap.cpp +++ b/projects/hip/hipify-clang/src/CUDA2HipMap.cpp @@ -2064,18 +2064,7 @@ const std::map CUDA_IDENTIFIER_MAP{ {"cudaGraphicsResourceGetMappedEglFrame", {"hipGraphicsResourceGetMappedEglFrame", CONV_EGL, API_RUNTIME, HIP_UNSUPPORTED}}, // API_Driver ANALOGUE (cuGraphicsResourceGetMappedEglFrame) ///////////////////////////// cuBLAS ///////////////////////////// - // Blas management functions - {"cublasInit", {"hipblasInit", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasShutdown", {"hipblasShutdown", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGetVersion", {"hipblasGetVersion", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGetError", {"hipblasGetError", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasAlloc", {"hipblasAlloc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasFree", {"hipblasFree", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSetKernelStream", {"hipblasSetKernelStream", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGetAtomicsMode", {"hipblasGetAtomicsMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSetAtomicsMode", {"hipblasSetAtomicsMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGetMathMode", {"hipblasGetMathMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSetMathMode", {"hipblasSetMathMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + // Blas Data Types // Blas operations {"cublasOperation_t", {"hipblasOperation_t", CONV_TYPE, API_BLAS}}, @@ -2084,6 +2073,7 @@ const std::map CUDA_IDENTIFIER_MAP{ {"CUBLAS_OP_C", {"HIPBLAS_OP_C", CONV_NUMERIC_LITERAL, API_BLAS}}, // Blas statuses + {"cublasStatus", {"hipblasStatus_t", CONV_TYPE, API_BLAS}}, {"cublasStatus_t", {"hipblasStatus_t", CONV_TYPE, API_BLAS}}, {"CUBLAS_STATUS_SUCCESS", {"HIPBLAS_STATUS_SUCCESS", CONV_NUMERIC_LITERAL, API_BLAS}}, {"CUBLAS_STATUS_NOT_INITIALIZED", {"HIPBLAS_STATUS_NOT_INITIALIZED", CONV_NUMERIC_LITERAL, API_BLAS}}, @@ -2094,6 +2084,7 @@ const std::map CUDA_IDENTIFIER_MAP{ {"CUBLAS_STATUS_INTERNAL_ERROR", {"HIPBLAS_STATUS_INTERNAL_ERROR", CONV_NUMERIC_LITERAL, API_BLAS}}, {"CUBLAS_STATUS_NOT_SUPPORTED", {"HIPBLAS_STATUS_NOT_SUPPORTED", CONV_NUMERIC_LITERAL, API_BLAS}}, {"CUBLAS_STATUS_ARCH_MISMATCH", {"HIPBLAS_STATUS_ARCH_MISMATCH", CONV_NUMERIC_LITERAL, API_BLAS}}, + {"CUBLAS_STATUS_LICENSE_ERROR", {"HIPBLAS_STATUS_LICENSE_ERROR", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // Blas Fill Modes {"cublasFillMode_t", {"hipblasFillMode_t", CONV_TYPE, API_BLAS}}, @@ -2154,6 +2145,12 @@ const std::map CUDA_IDENTIFIER_MAP{ {"CUBLAS_GEMM_ALGO15", {"HIPBLAS_GEMM_ALGO15", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 15 {"CUBLAS_GEMM_ALGO16", {"HIPBLAS_GEMM_ALGO16", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 16 {"CUBLAS_GEMM_ALGO17", {"HIPBLAS_GEMM_ALGO17", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 17 + {"CUBLAS_GEMM_ALGO18", {"HIPBLAS_GEMM_ALGO18", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 18 + {"CUBLAS_GEMM_ALGO19", {"HIPBLAS_GEMM_ALGO19", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 19 + {"CUBLAS_GEMM_ALGO20", {"HIPBLAS_GEMM_ALGO20", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 20 + {"CUBLAS_GEMM_ALGO21", {"HIPBLAS_GEMM_ALGO21", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 21 + {"CUBLAS_GEMM_ALGO22", {"HIPBLAS_GEMM_ALGO22", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 22 + {"CUBLAS_GEMM_ALGO23", {"HIPBLAS_GEMM_ALGO23", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 23 {"CUBLAS_GEMM_DEFAULT_TENSOR_OP", {"HIPBLAS_GEMM_DEFAULT_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 99 {"CUBLAS_GEMM_DFALT_TENSOR_OP", {"HIPBLAS_GEMM_DFALT_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 99 {"CUBLAS_GEMM_ALGO0_TENSOR_OP", {"HIPBLAS_GEMM_ALGO0_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 100 @@ -2161,647 +2158,675 @@ const std::map CUDA_IDENTIFIER_MAP{ {"CUBLAS_GEMM_ALGO2_TENSOR_OP", {"HIPBLAS_GEMM_ALGO2_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 102 {"CUBLAS_GEMM_ALGO3_TENSOR_OP", {"HIPBLAS_GEMM_ALGO3_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 103 {"CUBLAS_GEMM_ALGO4_TENSOR_OP", {"HIPBLAS_GEMM_ALGO4_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 104 + {"CUBLAS_GEMM_ALGO5_TENSOR_OP", {"HIPBLAS_GEMM_ALGO5_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 105 + {"CUBLAS_GEMM_ALGO6_TENSOR_OP", {"HIPBLAS_GEMM_ALGO6_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 106 + {"CUBLAS_GEMM_ALGO7_TENSOR_OP", {"HIPBLAS_GEMM_ALGO7_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 107 + {"CUBLAS_GEMM_ALGO8_TENSOR_OP", {"HIPBLAS_GEMM_ALGO8_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 108 + {"CUBLAS_GEMM_ALGO9_TENSOR_OP", {"HIPBLAS_GEMM_ALGO9_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 109 + {"CUBLAS_GEMM_ALGO10_TENSOR_OP", {"HIPBLAS_GEMM_ALGO10_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 110 + {"CUBLAS_GEMM_ALGO11_TENSOR_OP", {"HIPBLAS_GEMM_ALGO11_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 111 + {"CUBLAS_GEMM_ALGO12_TENSOR_OP", {"HIPBLAS_GEMM_ALGO12_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 112 + {"CUBLAS_GEMM_ALGO13_TENSOR_OP", {"HIPBLAS_GEMM_ALGO13_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 113 + {"CUBLAS_GEMM_ALGO14_TENSOR_OP", {"HIPBLAS_GEMM_ALGO14_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 114 + {"CUBLAS_GEMM_ALGO15_TENSOR_OP", {"HIPBLAS_GEMM_ALGO15_TENSOR_OP", CONV_NUMERIC_LITERAL, API_BLAS, HIP_UNSUPPORTED}}, // 115 + + ///////////////////////////// cuBLAS functions ///////////////////////////// + // Blas management functions + {"cublasInit", {"hipblasInit", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasShutdown", {"hipblasShutdown", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetVersion", {"hipblasGetVersion", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetError", {"hipblasGetError", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasAlloc", {"hipblasAlloc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasFree", {"hipblasFree", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetKernelStream", {"hipblasSetKernelStream", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetAtomicsMode", {"hipblasGetAtomicsMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetAtomicsMode", {"hipblasSetAtomicsMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetMathMode", {"hipblasGetMathMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetMathMode", {"hipblasSetMathMode", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + + // Blas logging + {"cublasLogCallback", {"hipblasLogCallback", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasLoggerConfigure", {"hipblasLoggerConfigure", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetLoggerCallback", {"hipblasSetLoggerCallback", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetLoggerCallback", {"hipblasGetLoggerCallback", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Blas1 (v1) Routines - {"cublasCreate", {"hipblasCreate", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDestroy", {"hipblasDestroy", CONV_MATH_FUNC, API_BLAS}}, - - {"cublasSetVector", {"hipblasSetVector", CONV_MATH_FUNC, API_BLAS}}, - {"cublasGetVector", {"hipblasGetVector", CONV_MATH_FUNC, API_BLAS}}, - {"cublasSetVectorAsync", {"hipblasSetVectorAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGetVectorAsync", {"hipblasGetVectorAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasSetMatrix", {"hipblasSetMatrix", CONV_MATH_FUNC, API_BLAS}}, - {"cublasGetMatrix", {"hipblasGetMatrix", CONV_MATH_FUNC, API_BLAS}}, - {"cublasGetMatrixAsync", {"hipblasGetMatrixAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSetMatrixAsync", {"hipblasSetMatrixAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasXerbla", {"hipblasXerbla", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCreate", {"hipblasCreate", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDestroy", {"hipblasDestroy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSetStream", {"hipblasSetStream", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetStream", {"hipblasGetStream", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetPointerMode", {"hipblasGetPointerMode", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSetPointerMode", {"hipblasSetPointerMode", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSetVector", {"hipblasSetVector", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetVector", {"hipblasGetVector", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSetVectorAsync", {"hipblasSetVectorAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetVectorAsync", {"hipblasGetVectorAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetMatrix", {"hipblasSetMatrix", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetMatrix", {"hipblasGetMatrix", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetMatrixAsync", {"hipblasGetMatrixAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetMatrixAsync", {"hipblasSetMatrixAsync", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasXerbla", {"hipblasXerbla", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // NRM2 - {"cublasSnrm2", {"hipblasSnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDnrm2", {"hipblasDnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasScnrm2", {"hipblasScnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDznrm2", {"hipblasDznrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasNrm2Ex", {"hipblasNrm2Ex", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSnrm2", {"hipblasSnrm2", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDnrm2", {"hipblasDnrm2", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScnrm2", {"hipblasScnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDznrm2", {"hipblasDznrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasNrm2Ex", {"hipblasNrm2Ex", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // DOT - {"cublasSdot", {"hipblasSdot", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSdot", {"hipblasSdot", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasSdotBatched", {"hipblasSdotBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDdot", {"hipblasDdot", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSdotBatched", {"hipblasSdotBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDdot", {"hipblasDdot", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasDdotBatched", {"hipblasDdotBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCdotu", {"hipblasCdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCdotc", {"hipblasCdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdotu", {"hipblasZdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdotc", {"hipblasZdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDdotBatched", {"hipblasDdotBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCdotu", {"hipblasCdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCdotc", {"hipblasCdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdotu", {"hipblasZdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdotc", {"hipblasZdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SCAL - {"cublasSscal", {"hipblasSscal", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSscal", {"hipblasSscal", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasSscalBatched", {"hipblasSscalBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDscal", {"hipblasDscal", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSscalBatched", {"hipblasSscalBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDscal", {"hipblasDscal", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasDscalBatched", {"hipblasDscalBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCscal", {"hipblasCscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsscal", {"hipblasCsscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZscal", {"hipblasZscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdscal", {"hipblasZdscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDscalBatched", {"hipblasDscalBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCscal", {"hipblasCscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsscal", {"hipblasCsscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZscal", {"hipblasZscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdscal", {"hipblasZdscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AXPY - {"cublasSaxpy", {"hipblasSaxpy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasSaxpyBatched", {"hipblasSaxpyBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDaxpy", {"hipblasDaxpy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCaxpy", {"hipblasCaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZaxpy", {"hipblasZaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSaxpy", {"hipblasSaxpy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSaxpyBatched", {"hipblasSaxpyBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDaxpy", {"hipblasDaxpy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCaxpy", {"hipblasCaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZaxpy", {"hipblasZaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // COPY - {"cublasScopy", {"hipblasScopy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScopy", {"hipblasScopy", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasScopyBatched", {"hipblasScopyBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDcopy", {"hipblasDcopy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScopyBatched", {"hipblasScopyBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDcopy", {"hipblasDcopy", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasDcopyBatched", {"hipblasDcopyBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCcopy", {"hipblasCcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZcopy", {"hipblasZcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDcopyBatched", {"hipblasDcopyBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCcopy", {"hipblasCcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZcopy", {"hipblasZcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SWAP - {"cublasSswap", {"hipblasSswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDswap", {"hipblasDswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCswap", {"hipblasCswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZswap", {"hipblasZswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSswap", {"hipblasSswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDswap", {"hipblasDswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCswap", {"hipblasCswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZswap", {"hipblasZswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AMAX - {"cublasIsamax", {"hipblasIsamax", CONV_MATH_FUNC, API_BLAS}}, - {"cublasIdamax", {"hipblasIdamax", CONV_MATH_FUNC, API_BLAS}}, - {"cublasIcamax", {"hipblasIcamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIzamax", {"hipblasIzamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIsamax", {"hipblasIsamax", CONV_MATH_FUNC, API_BLAS}}, + {"cublasIdamax", {"hipblasIdamax", CONV_MATH_FUNC, API_BLAS}}, + {"cublasIcamax", {"hipblasIcamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIzamax", {"hipblasIzamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AMIN - {"cublasIsamin", {"hipblasIsamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIdamin", {"hipblasIdamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIcamin", {"hipblasIcamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIzamin", {"hipblasIzamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIsamin", {"hipblasIsamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIdamin", {"hipblasIdamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIcamin", {"hipblasIcamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIzamin", {"hipblasIzamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ASUM - {"cublasSasum", {"hipblasSasum", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSasum", {"hipblasSasum", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasSasumBatched", {"hipblasSasumBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDasum", {"hipblasDasum", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSasumBatched", {"hipblasSasumBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDasum", {"hipblasDasum", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasDasumBatched", {"hipblasDasumBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasScasum", {"hipblasScasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDzasum", {"hipblasDzasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDasumBatched", {"hipblasDasumBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScasum", {"hipblasScasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDzasum", {"hipblasDzasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROT - {"cublasSrot", {"hipblasSrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrot", {"hipblasDrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCrot", {"hipblasCrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsrot", {"hipblasCsrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZrot", {"hipblasZrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdrot", {"hipblasZdrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrot", {"hipblasSrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrot", {"hipblasDrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCrot", {"hipblasCrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsrot", {"hipblasCsrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZrot", {"hipblasZrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdrot", {"hipblasZdrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTG - {"cublasSrotg", {"hipblasSrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotg", {"hipblasDrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCrotg", {"hipblasCrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZrotg", {"hipblasZrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotg", {"hipblasSrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotg", {"hipblasDrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCrotg", {"hipblasCrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZrotg", {"hipblasZrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTM - {"cublasSrotm", {"hipblasSrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotm", {"hipblasDrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotm", {"hipblasSrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotm", {"hipblasDrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTMG - {"cublasSrotmg", {"hipblasSrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotmg", {"hipblasDrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotmg", {"hipblasSrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotmg", {"hipblasDrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GEMV - {"cublasSgemv", {"hipblasSgemv", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSgemv", {"hipblasSgemv", CONV_MATH_FUNC, API_BLAS}}, // there is no such a function in CUDA - {"cublasSgemvBatched", {"hipblasSgemvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgemv", {"hipblasDgemv", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCgemv", {"hipblasCgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgemv", {"hipblasZgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemvBatched", {"hipblasSgemvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgemv", {"hipblasDgemv", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgemv", {"hipblasCgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemv", {"hipblasZgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GBMV - {"cublasSgbmv", {"hipblasSgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgbmv", {"hipblasDgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgbmv", {"hipblasCgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgbmv", {"hipblasZgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgbmv", {"hipblasSgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgbmv", {"hipblasDgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgbmv", {"hipblasCgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgbmv", {"hipblasZgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRMV - {"cublasStrmv", {"hipblasStrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrmv", {"hipblasDtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrmv", {"hipblasCtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrmv", {"hipblasZtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrmv", {"hipblasStrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrmv", {"hipblasDtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrmv", {"hipblasCtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrmv", {"hipblasZtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TBMV - {"cublasStbmv", {"hipblasStbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtbmv", {"hipblasDtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtbmv", {"hipblasCtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtbmv", {"hipblasZtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStbmv", {"hipblasStbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtbmv", {"hipblasDtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtbmv", {"hipblasCtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtbmv", {"hipblasZtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TPMV - {"cublasStpmv", {"hipblasStpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtpmv", {"hipblasDtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtpmv", {"hipblasCtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtpmv", {"hipblasZtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStpmv", {"hipblasStpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtpmv", {"hipblasDtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtpmv", {"hipblasCtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtpmv", {"hipblasZtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSV - {"cublasStrsv", {"hipblasStrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrsv", {"hipblasDtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrsv", {"hipblasCtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsv", {"hipblasZtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsv", {"hipblasStrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrsv", {"hipblasDtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrsv", {"hipblasCtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsv", {"hipblasZtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TPSV - {"cublasStpsv", {"hipblasStpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtpsv", {"hipblasDtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtpsv", {"hipblasCtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtpsv", {"hipblasZtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStpsv", {"hipblasStpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtpsv", {"hipblasDtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtpsv", {"hipblasCtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtpsv", {"hipblasZtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TBSV - {"cublasStbsv", {"hipblasStbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtbsv", {"hipblasDtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtbsv", {"hipblasCtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtbsv", {"hipblasZtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStbsv", {"hipblasStbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtbsv", {"hipblasDtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtbsv", {"hipblasCtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtbsv", {"hipblasZtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYMV/HEMV - {"cublasSsymv", {"hipblasSsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsymv", {"hipblasDsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsymv", {"hipblasCsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsymv", {"hipblasZsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChemv", {"hipblasChemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhemv", {"hipblasZhemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsymv", {"hipblasSsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsymv", {"hipblasDsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsymv", {"hipblasCsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsymv", {"hipblasZsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChemv", {"hipblasChemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhemv", {"hipblasZhemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SBMV/HBMV - {"cublasSsbmv", {"hipblasSsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsbmv", {"hpiblasDsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChbmv", {"hipblasChbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhbmv", {"hipblasZhbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsbmv", {"hipblasSsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsbmv", {"hpiblasDsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChbmv", {"hipblasChbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhbmv", {"hipblasZhbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPMV/HPMV - {"cublasSspmv", {"hipblasSspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspmv", {"hipblasDspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpmv", {"hipblasChpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpmv", {"hipblasZhpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspmv", {"hipblasSspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspmv", {"hipblasDspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpmv", {"hipblasChpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpmv", {"hipblasZhpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GER - {"cublasSger", {"hipblasSger", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDger", {"hipblasDger", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCgeru", {"hipblasCgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgerc", {"hipblasCgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgeru", {"hipblasZgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgerc", {"hipblasZgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSger", {"hipblasSger", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDger", {"hipblasDger", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgeru", {"hipblasCgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgerc", {"hipblasCgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgeru", {"hipblasZgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgerc", {"hipblasZgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR/HER - {"cublasSsyr", {"hipblasSsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr", {"hipblasDsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCher", {"hipblasCher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher", {"hipblasZher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr", {"hipblasSsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr", {"hipblasDsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr", {"hipblasCsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr", {"hipblasZsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher", {"hipblasCher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher", {"hipblasZher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPR/HPR - {"cublasSspr", {"hipblasSspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspr", {"hipblasDspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpr", {"hipblasChpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpr", {"hipblasZhpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspr", {"hipblasSspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspr", {"hipblasDspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpr", {"hipblasChpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpr", {"hipblasZhpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR2/HER2 - {"cublasSsyr2", {"hipblasSsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr2", {"hipblasDsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCher2", {"hipblasCher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher2", {"hipblasZher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr2", {"hipblasSsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr2", {"hipblasDsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr2", {"hipblasCsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr2", {"hipblasZsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher2", {"hipblasCher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher2", {"hipblasZher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPR2/HPR2 - {"cublasSspr2", {"hipblasSspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspr2", {"hipblasDspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpr2", {"hipblasChpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpr2", {"hipblasZhpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspr2", {"hipblasSspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspr2", {"hipblasDspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpr2", {"hipblasChpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpr2", {"hipblasZhpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Blas3 (v1) Routines // GEMM - {"cublasSgemm", {"hipblasSgemm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDgemm", {"hipblasDgemm", CONV_MATH_FUNC, API_BLAS}}, - - {"cublasCgemm", {"hipblasCgemm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasZgemm", {"hipblasZgemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasHgemm", {"hipblasHgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSgemm", {"hipblasSgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDgemm", {"hipblasDgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgemm", {"hipblasCgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasZgemm", {"hipblasZgemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasHgemm", {"hipblasHgemm", CONV_MATH_FUNC, API_BLAS}}, // BATCH GEMM - {"cublasSgemmBatched", {"hipblasSgemmBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDgemmBatched", {"hipblasDgemmBatched", CONV_MATH_FUNC, API_BLAS}}, - {"cublasHgemmBatched", {"hipblasHgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasSgemmStridedBatched", {"hipblasSgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgemmStridedBatched", {"hipblasDgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasCgemmBatched", {"hipblasCgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgemm3mBatched", {"hipblasCgemm3mBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgemmBatched", {"hipblasZgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasCgemmStridedBatched", {"hipblasCgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgemm3mStridedBatched", {"hipblasCgemm3mStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgemmStridedBatched", {"hipblasZgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasHgemmStridedBatched", {"hipblasHgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemmBatched", {"hipblasSgemmBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDgemmBatched", {"hipblasDgemmBatched", CONV_MATH_FUNC, API_BLAS}}, + {"cublasHgemmBatched", {"hipblasHgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemmStridedBatched", {"hipblasSgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgemmStridedBatched", {"hipblasDgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemmBatched", {"hipblasCgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemm3mBatched", {"hipblasCgemm3mBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemmBatched", {"hipblasZgemmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemmStridedBatched", {"hipblasCgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemm3mStridedBatched", {"hipblasCgemm3mStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemmStridedBatched", {"hipblasZgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasHgemmStridedBatched", {"hipblasHgemmStridedBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYRK - {"cublasSsyrk", {"hipblasSsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyrk", {"hipblasDsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyrk", {"hipblasCsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyrk", {"hipblasZsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyrk", {"hipblasSsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyrk", {"hipblasDsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyrk", {"hipblasCsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyrk", {"hipblasZsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HERK - {"cublasCherk", {"hipblasCherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZherk", {"hipblasZherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCherk", {"hipblasCherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZherk", {"hipblasZherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR2K - {"cublasSsyr2k", {"hipblasSsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr2k", {"hipblasDsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyr2k", {"hipblasCsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyr2k", {"hipblasZsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr2k", {"hipblasSsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr2k", {"hipblasDsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr2k", {"hipblasCsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr2k", {"hipblasZsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYRKX - eXtended SYRK - {"cublasSsyrkx", {"hipblasSsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyrkx", {"hipblasDsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyrkx", {"hipblasCsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyrkx", {"hipblasZsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyrkx", {"hipblasSsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyrkx", {"hipblasDsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyrkx", {"hipblasCsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyrkx", {"hipblasZsyrkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HER2K - {"cublasCher2k", {"hipblasCher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher2k", {"hipblasZher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher2k", {"hipblasCher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher2k", {"hipblasZher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HERKX - eXtended HERK - {"cublasCherkx", {"hipblasCherkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZherkx", {"hipblasZherkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCherkx", {"hipblasCherkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZherkx", {"hipblasZherkx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYMM - {"cublasSsymm", {"hipblasSsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsymm", {"hipblasDsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsymm", {"hipblasCsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsymm", {"hipblasZsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsymm", {"hipblasSsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsymm", {"hipblasDsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsymm", {"hipblasCsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsymm", {"hipblasZsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HEMM - {"cublasChemm", {"hipblasChemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhemm", {"hipblasZhemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChemm", {"hipblasChemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhemm", {"hipblasZhemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSM - {"cublasStrsm", {"hipblasStrsm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDtrsm", {"hipblasDtrsm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCtrsm", {"hipblasCtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsm", {"hipblasZtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsm", {"hipblasStrsm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDtrsm", {"hipblasDtrsm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCtrsm", {"hipblasCtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsm", {"hipblasZtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSM - Batched Triangular Solver - {"cublasStrsmBatched", {"hipblasStrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrsmBatched", {"hipblasDtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrsmBatched", {"hipblasCtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsmBatched", {"hipblasZtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsmBatched", {"hipblasStrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrsmBatched", {"hipblasDtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrsmBatched", {"hipblasCtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsmBatched", {"hipblasZtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRMM - {"cublasStrmm", {"hipblasStrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrmm", {"hipblasDtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrmm", {"hipblasCtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrmm", {"hipblasZtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrmm", {"hipblasStrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrmm", {"hipblasDtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrmm", {"hipblasCtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrmm", {"hipblasZtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ------------------------ CUBLAS BLAS - like extension (cublas_api.h) // GEAM - {"cublasSgeam", {"hipblasSgeam", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDgeam", {"hipblasDgeam", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCgeam", {"hipblasCgeam", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgeam", {"hipblasZgeam", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgeam", {"hipblasSgeam", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDgeam", {"hipblasDgeam", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgeam", {"hipblasCgeam", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgeam", {"hipblasZgeam", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GETRF - Batched LU - {"cublasSgetrfBatched", {"hipblasSgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgetrfBatched", {"hipblasDgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgetrfBatched", {"hipblasCgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgetrfBatched", {"hipblasZgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgetrfBatched", {"hipblasSgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgetrfBatched", {"hipblasDgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgetrfBatched", {"hipblasCgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgetrfBatched", {"hipblasZgetrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Batched inversion based on LU factorization from getrf - {"cublasSgetriBatched", {"hipblasSgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgetriBatched", {"hipblasDgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgetriBatched", {"hipblasCgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgetriBatched", {"hipblasZgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgetriBatched", {"hipblasSgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgetriBatched", {"hipblasDgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgetriBatched", {"hipblasCgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgetriBatched", {"hipblasZgetriBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Batched solver based on LU factorization from getrf - {"cublasSgetrsBatched", {"hipblasSgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgetrsBatched", {"hipblasDgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgetrsBatched", {"hipblasCgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgetrsBatched", {"hipblasZgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgetrsBatched", {"hipblasSgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgetrsBatched", {"hipblasDgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgetrsBatched", {"hipblasCgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgetrsBatched", {"hipblasZgetrsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSM - Batched Triangular Solver - {"cublasStrsmBatched", {"hipblasStrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrsmBatched", {"hipblasDtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrsmBatched", {"hipblasCtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsmBatched", {"hipblasZtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsmBatched", {"hipblasStrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrsmBatched", {"hipblasDtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrsmBatched", {"hipblasCtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsmBatched", {"hipblasZtrsmBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // MATINV - Batched - {"cublasSmatinvBatched", {"hipblasSmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDmatinvBatched", {"hipblasDmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCmatinvBatched", {"hipblasCmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZmatinvBatched", {"hipblasZmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSmatinvBatched", {"hipblasSmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDmatinvBatched", {"hipblasDmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCmatinvBatched", {"hipblasCmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZmatinvBatched", {"hipblasZmatinvBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Batch QR Factorization - {"cublasSgeqrfBatched", {"hipblasSgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgeqrfBatched", {"hipblasDgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgeqrfBatched", {"hipblasCgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgeqrfBatched", {"hipblasZgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgeqrfBatched", {"hipblasSgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgeqrfBatched", {"hipblasDgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgeqrfBatched", {"hipblasCgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgeqrfBatched", {"hipblasZgeqrfBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Least Square Min only m >= n and Non-transpose supported - {"cublasSgelsBatched", {"hipblasSgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgelsBatched", {"hipblasDgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgelsBatched", {"hipblasCgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgelsBatched", {"hipblasZgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgelsBatched", {"hipblasSgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgelsBatched", {"hipblasDgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgelsBatched", {"hipblasCgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgelsBatched", {"hipblasZgelsBatched", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // DGMM - {"cublasSdgmm", {"hipblasSdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDdgmm", {"hipblasDdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCdgmm", {"hipblasCdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdgmm", {"hipblasZdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSdgmm", {"hipblasSdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDdgmm", {"hipblasDdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCdgmm", {"hipblasCdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdgmm", {"hipblasZdgmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TPTTR - Triangular Pack format to Triangular format - {"cublasStpttr", {"hipblasStpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtpttr", {"hipblasDtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtpttr", {"hipblasCtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtpttr", {"hipblasZtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStpttr", {"hipblasStpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtpttr", {"hipblasDtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtpttr", {"hipblasCtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtpttr", {"hipblasZtpttr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRTTP - Triangular format to Triangular Pack format - {"cublasStrttp", {"hipblasStrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrttp", {"hipblasDtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrttp", {"hipblasCtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrttp", {"hipblasZtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrttp", {"hipblasStrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrttp", {"hipblasDtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrttp", {"hipblasCtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrttp", {"hipblasZtrttp", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Blas2 (v2) Routines - {"cublasCreate_v2", {"hipblasCreate", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDestroy_v2", {"hipblasDestroy", CONV_MATH_FUNC, API_BLAS}}, - - {"cublasGetVersion_v2", {"hipblasGetVersion", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSetStream_v2", {"hipblasSetStream", CONV_MATH_FUNC, API_BLAS}}, - {"cublasGetStream_v2", {"hipblasGetStream", CONV_MATH_FUNC, API_BLAS}}, - {"cublasGetPointerMode_v2", {"hipblasGetPointerMode", CONV_MATH_FUNC, API_BLAS}}, - {"cublasSetPointerMode_v2", {"hipblasSetPointerMode", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCreate_v2", {"hipblasCreate", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDestroy_v2", {"hipblasDestroy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetVersion_v2", {"hipblasGetVersion", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGetProperty", {"hipblasGetProperty", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSetStream_v2", {"hipblasSetStream", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetStream_v2", {"hipblasGetStream", CONV_MATH_FUNC, API_BLAS}}, + {"cublasGetPointerMode_v2", {"hipblasGetPointerMode", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSetPointerMode_v2", {"hipblasSetPointerMode", CONV_MATH_FUNC, API_BLAS}}, // GEMV - {"cublasSgemv_v2", {"hipblasSgemv", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDgemv_v2", {"hipblasDgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgemv_v2", {"hipblasCgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgemv_v2", {"hipblasZgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemv_v2", {"hipblasSgemv", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDgemv_v2", {"hipblasDgemv", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgemv_v2", {"hipblasCgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemv_v2", {"hipblasZgemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GBMV - {"cublasSgbmv_v2", {"hipblasSgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDgbmv_v2", {"hipblasDgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgbmv_v2", {"hipblasCgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgbmv_v2", {"hipblasZgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgbmv_v2", {"hipblasSgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDgbmv_v2", {"hipblasDgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgbmv_v2", {"hipblasCgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgbmv_v2", {"hipblasZgbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRMV - {"cublasStrmv_v2", {"hipblasStrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrmv_v2", {"hipblasDtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrmv_v2", {"hipblasCtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrmv_v2", {"hipblasZtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrmv_v2", {"hipblasStrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrmv_v2", {"hipblasDtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrmv_v2", {"hipblasCtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrmv_v2", {"hipblasZtrmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TBMV - {"cublasStbmv_v2", {"hipblasStbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtbmv_v2", {"hipblasDtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtbmv_v2", {"hipblasCtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtbmv_v2", {"hipblasZtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStbmv_v2", {"hipblasStbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtbmv_v2", {"hipblasDtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtbmv_v2", {"hipblasCtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtbmv_v2", {"hipblasZtbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TPMV - {"cublasStpmv_v2", {"hipblasStpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtpmv_v2", {"hipblasDtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtpmv_v2", {"hipblasCtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtpmv_v2", {"hipblasZtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStpmv_v2", {"hipblasStpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtpmv_v2", {"hipblasDtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtpmv_v2", {"hipblasCtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtpmv_v2", {"hipblasZtpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSV - {"cublasStrsv_v2", {"hipblasStrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrsv_v2", {"hipblasDtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrsv_v2", {"hipblasCtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsv_v2", {"hipblasZtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsv_v2", {"hipblasStrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrsv_v2", {"hipblasDtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrsv_v2", {"hipblasCtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsv_v2", {"hipblasZtrsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TPSV - {"cublasStpsv_v2", {"hipblasStpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtpsv_v2", {"hipblasDtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtpsv_v2", {"hipblasCtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtpsv_v2", {"hipblasZtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStpsv_v2", {"hipblasStpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtpsv_v2", {"hipblasDtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtpsv_v2", {"hipblasCtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtpsv_v2", {"hipblasZtpsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TBSV - {"cublasStbsv_v2", {"hipblasStbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtbsv_v2", {"hipblasDtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtbsv_v2", {"hipblasCtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtbsv_v2", {"hipblasZtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStbsv_v2", {"hipblasStbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtbsv_v2", {"hipblasDtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtbsv_v2", {"hipblasCtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtbsv_v2", {"hipblasZtbsv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYMV/HEMV - {"cublasSsymv_v2", {"hipblasSsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsymv_v2", {"hipblasDsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsymv_v2", {"hipblasCsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsymv_v2", {"hipblasZsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChemv_v2", {"hipblasChemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhemv_v2", {"hipblasZhemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsymv_v2", {"hipblasSsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsymv_v2", {"hipblasDsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsymv_v2", {"hipblasCsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsymv_v2", {"hipblasZsymv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChemv_v2", {"hipblasChemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhemv_v2", {"hipblasZhemv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SBMV/HBMV - {"cublasSsbmv_v2", {"hipblasSsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsbmv_v2", {"hpiblasDsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChbmv_v2", {"hipblasChbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhbmv_v2", {"hipblasZhbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsbmv_v2", {"hipblasSsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsbmv_v2", {"hpiblasDsbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChbmv_v2", {"hipblasChbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhbmv_v2", {"hipblasZhbmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPMV/HPMV - {"cublasSspmv_v2", {"hipblasSspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspmv_v2", {"hipblasDspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpmv_v2", {"hipblasChpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpmv_v2", {"hipblasZhpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspmv_v2", {"hipblasSspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspmv_v2", {"hipblasDspmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpmv_v2", {"hipblasChpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpmv_v2", {"hipblasZhpmv", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // GER - {"cublasSger_v2", {"hipblasSger", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDger_v2", {"hipblasDger", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCgeru_v2", {"hipblasCgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgerc_v2", {"hipblasCgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgeru_v2", {"hipblasZgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgerc_v2", {"hipblasZgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSger_v2", {"hipblasSger", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDger_v2", {"hipblasDger", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgeru_v2", {"hipblasCgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgerc_v2", {"hipblasCgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgeru_v2", {"hipblasZgeru", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgerc_v2", {"hipblasZgerc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR/HER - {"cublasSsyr_v2", {"hipblasSsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr_v2", {"hipblasDsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyr_v2", {"hipblasCsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyr_v2", {"hipblasZsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCher_v2", {"hipblasCher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher_v2", {"hipblasZher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr_v2", {"hipblasSsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr_v2", {"hipblasDsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr_v2", {"hipblasCsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr_v2", {"hipblasZsyr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher_v2", {"hipblasCher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher_v2", {"hipblasZher", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPR/HPR - {"cublasSspr_v2", {"hipblasSspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspr_v2", {"hipblasDspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpr_v2", {"hipblasChpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpr_v2", {"hipblasZhpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspr_v2", {"hipblasSspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspr_v2", {"hipblasDspr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpr_v2", {"hipblasChpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpr_v2", {"hipblasZhpr", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR2/HER2 - {"cublasSsyr2_v2", {"hipblasSsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr2_v2", {"hipblasDsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyr2_v2", {"hipblasCsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyr2_v2", {"hipblasZsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCher2_v2", {"hipblasCher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher2_v2", {"hipblasZher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr2_v2", {"hipblasSsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr2_v2", {"hipblasDsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr2_v2", {"hipblasCsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr2_v2", {"hipblasZsyr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher2_v2", {"hipblasCher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher2_v2", {"hipblasZher2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SPR2/HPR2 - {"cublasSspr2_v2", {"hipblasSspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDspr2_v2", {"hipblasDspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasChpr2_v2", {"hipblasChpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhpr2_v2", {"hipblasZhpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSspr2_v2", {"hipblasSspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDspr2_v2", {"hipblasDspr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChpr2_v2", {"hipblasChpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhpr2_v2", {"hipblasZhpr2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // Blas3 (v2) Routines // GEMM - {"cublasSgemm_v2", {"hipblasSgemm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDgemm_v2", {"hipblasDgemm", CONV_MATH_FUNC, API_BLAS}}, - - {"cublasCgemm_v2", {"hipblasCgemm", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCgemm3m", {"hipblasCgemm3m", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCgemm3mEx", {"hipblasCgemm3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasZgemm_v2", {"hipblasZgemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZgemm3m", {"hipblasZgemm3m", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemm_v2", {"hipblasSgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDgemm_v2", {"hipblasDgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgemm_v2", {"hipblasCgemm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCgemm3m", {"hipblasCgemm3m", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemm3mEx", {"hipblasCgemm3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemm_v2", {"hipblasZgemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZgemm3m", {"hipblasZgemm3m", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, //IO in FP16 / FP32, computation in float - {"cublasSgemmEx", {"hipblasSgemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGemmEx", {"hipblasGemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGemmBatchedEx", {"hipblasGemmBatchedEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasGemmStridedBatchedEx", {"hipblasGemmStridedBatchedEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSgemmEx", {"hipblasSgemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGemmEx", {"hipblasGemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGemmBatchedEx", {"hipblasGemmBatchedEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasGemmStridedBatchedEx", {"hipblasGemmStridedBatchedEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // IO in Int8 complex/cuComplex, computation in cuComplex - {"cublasCgemmEx", {"hipblasCgemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - - {"cublasUint8gemmBias", {"hipblasUint8gemmBias", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCgemmEx", {"hipblasCgemmEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasUint8gemmBias", {"hipblasUint8gemmBias", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYRK - {"cublasSsyrk_v2", {"hipblasSsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyrk_v2", {"hipblasDsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyrk_v2", {"hipblasCsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyrk_v2", {"hipblasZsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyrk_v2", {"hipblasSsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyrk_v2", {"hipblasDsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyrk_v2", {"hipblasCsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyrk_v2", {"hipblasZsyrk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // IO in Int8 complex/cuComplex, computation in cuComplex - {"cublasCsyrkEx", {"hipblasCsyrkEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyrkEx", {"hipblasCsyrkEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // IO in Int8 complex/cuComplex, computation in cuComplex, Gaussian math - {"cublasCsyrk3mEx", {"hipblasCsyrk3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyrk3mEx", {"hipblasCsyrk3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HERK - {"cublasCherk_v2", {"hipblasCherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCherk_v2", {"hipblasCherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // IO in Int8 complex/cuComplex, computation in cuComplex - {"cublasCherkEx", {"hipblasCherkEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCherkEx", {"hipblasCherkEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // IO in Int8 complex/cuComplex, computation in cuComplex, Gaussian math - {"cublasCherk3mEx", {"hipblasCherk3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZherk_v2", {"hipblasZherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCherk3mEx", {"hipblasCherk3mEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZherk_v2", {"hipblasZherk", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYR2K - {"cublasSsyr2k_v2", {"hipblasSsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsyr2k_v2", {"hipblasDsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsyr2k_v2", {"hipblasCsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsyr2k_v2", {"hipblasZsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsyr2k_v2", {"hipblasSsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsyr2k_v2", {"hipblasDsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsyr2k_v2", {"hipblasCsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsyr2k_v2", {"hipblasZsyr2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HER2K - {"cublasCher2k_v2", {"hipblasCher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZher2k_v2", {"hipblasZher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCher2k_v2", {"hipblasCher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZher2k_v2", {"hipblasZher2k", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SYMM - {"cublasSsymm_v2", {"hipblasSsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDsymm_v2", {"hipblasDsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsymm_v2", {"hipblasCsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZsymm_v2", {"hipblasZsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSsymm_v2", {"hipblasSsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDsymm_v2", {"hipblasDsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsymm_v2", {"hipblasCsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZsymm_v2", {"hipblasZsymm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // HEMM - {"cublasChemm_v2", {"hipblasChemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZhemm_v2", {"hipblasZhemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasChemm_v2", {"hipblasChemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZhemm_v2", {"hipblasZhemm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRSM - {"cublasStrsm_v2", {"hipblasStrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrsm_v2", {"hipblasDtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrsm_v2", {"hipblasCtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrsm_v2", {"hipblasZtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrsm_v2", {"hipblasStrsm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDtrsm_v2", {"hipblasDtrsm", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCtrsm_v2", {"hipblasCtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrsm_v2", {"hipblasZtrsm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // TRMM - {"cublasStrmm_v2", {"hipblasStrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDtrmm_v2", {"hipblasDtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCtrmm_v2", {"hipblasCtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZtrmm_v2", {"hipblasZtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasStrmm_v2", {"hipblasStrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDtrmm_v2", {"hipblasDtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCtrmm_v2", {"hipblasCtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZtrmm_v2", {"hipblasZtrmm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // NRM2 - {"cublasSnrm2_v2", {"hipblasSnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDnrm2_v2", {"hipblasDnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasScnrm2_v2", {"hipblasScnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDznrm2_v2", {"hipblasDznrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSnrm2_v2", {"hipblasSnrm2", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDnrm2_v2", {"hipblasDnrm2", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScnrm2_v2", {"hipblasScnrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDznrm2_v2", {"hipblasDznrm2", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // DOT - {"cublasDotEx", {"hipblasDotEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDotcEx", {"hipblasDotcEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDotEx", {"hipblasDotEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDotcEx", {"hipblasDotcEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSdot_v2", {"hipblasSdot", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDdot_v2", {"hipblasDdot", CONV_MATH_FUNC, API_BLAS}}, + {"cublasSdot_v2", {"hipblasSdot", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDdot_v2", {"hipblasDdot", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCdotu_v2", {"hipblasCdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCdotc_v2", {"hipblasCdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdotu_v2", {"hipblasZdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdotc_v2", {"hipblasZdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCdotu_v2", {"hipblasCdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCdotc_v2", {"hipblasCdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdotu_v2", {"hipblasZdotu", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdotc_v2", {"hipblasZdotc", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SCAL - {"cublasScalEx", {"hipblasScalEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSscal_v2", {"hipblasSscal", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDscal_v2", {"hipblasDscal", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCscal_v2", {"hipblasCscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsscal_v2", {"hipblasCsscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZscal_v2", {"hipblasZscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdscal_v2", {"hipblasZdscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasScalEx", {"hipblasScalEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSscal_v2", {"hipblasSscal", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDscal_v2", {"hipblasDscal", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCscal_v2", {"hipblasCscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsscal_v2", {"hipblasCsscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZscal_v2", {"hipblasZscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdscal_v2", {"hipblasZdscal", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AXPY - {"cublasAxpyEx", {"hipblasAxpyEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasSaxpy_v2", {"hipblasSaxpy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDaxpy_v2", {"hipblasDaxpy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCaxpy_v2", {"hipblasCaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZaxpy_v2", {"hipblasZaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasAxpyEx", {"hipblasAxpyEx", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSaxpy_v2", {"hipblasSaxpy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDaxpy_v2", {"hipblasDaxpy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCaxpy_v2", {"hipblasCaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZaxpy_v2", {"hipblasZaxpy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // COPY - {"cublasScopy_v2", {"hipblasScopy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDcopy_v2", {"hipblasDcopy", CONV_MATH_FUNC, API_BLAS}}, - {"cublasCcopy_v2", {"hipblasCcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZcopy_v2", {"hipblasZcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasScopy_v2", {"hipblasScopy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDcopy_v2", {"hipblasDcopy", CONV_MATH_FUNC, API_BLAS}}, + {"cublasCcopy_v2", {"hipblasCcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZcopy_v2", {"hipblasZcopy", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // SWAP - {"cublasSswap_v2", {"hipblasSswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDswap_v2", {"hipblasDswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCswap_v2", {"hipblasCswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZswap_v2", {"hipblasZswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSswap_v2", {"hipblasSswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDswap_v2", {"hipblasDswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCswap_v2", {"hipblasCswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZswap_v2", {"hipblasZswap", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AMAX - {"cublasIsamax_v2", {"hipblasIsamax", CONV_MATH_FUNC, API_BLAS}}, - {"cublasIdamax_v2", {"hipblasIdamax", CONV_MATH_FUNC, API_BLAS}}, - {"cublasIcamax_v2", {"hipblasIcamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIzamax_v2", {"hipblasIzamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIsamax_v2", {"hipblasIsamax", CONV_MATH_FUNC, API_BLAS}}, + {"cublasIdamax_v2", {"hipblasIdamax", CONV_MATH_FUNC, API_BLAS}}, + {"cublasIcamax_v2", {"hipblasIcamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIzamax_v2", {"hipblasIzamax", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // AMIN - {"cublasIsamin_v2", {"hipblasIsamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIdamin_v2", {"hipblasIdamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIcamin_v2", {"hipblasIcamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasIzamin_v2", {"hipblasIzamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIsamin_v2", {"hipblasIsamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIdamin_v2", {"hipblasIdamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIcamin_v2", {"hipblasIcamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasIzamin_v2", {"hipblasIzamin", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ASUM - {"cublasSasum_v2", {"hipblasSasum", CONV_MATH_FUNC, API_BLAS}}, - {"cublasDasum_v2", {"hipblasDasum", CONV_MATH_FUNC, API_BLAS}}, - {"cublasScasum_v2", {"hipblasScasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDzasum_v2", {"hipblasDzasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSasum_v2", {"hipblasSasum", CONV_MATH_FUNC, API_BLAS}}, + {"cublasDasum_v2", {"hipblasDasum", CONV_MATH_FUNC, API_BLAS}}, + {"cublasScasum_v2", {"hipblasScasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDzasum_v2", {"hipblasDzasum", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROT - {"cublasSrot_v2", {"hipblasSrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrot_v2", {"hipblasDrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCrot_v2", {"hipblasCrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCsrot_v2", {"hipblasCsrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZrot_v2", {"hipblasZrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZdrot_v2", {"hipblasZdrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrot_v2", {"hipblasSrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrot_v2", {"hipblasDrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCrot_v2", {"hipblasCrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCsrot_v2", {"hipblasCsrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZrot_v2", {"hipblasZrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZdrot_v2", {"hipblasZdrot", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTG - {"cublasSrotg_v2", {"hipblasSrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotg_v2", {"hipblasDrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasCrotg_v2", {"hipblasCrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasZrotg_v2", {"hipblasZrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotg_v2", {"hipblasSrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotg_v2", {"hipblasDrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasCrotg_v2", {"hipblasCrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasZrotg_v2", {"hipblasZrotg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTM - {"cublasSrotm_v2", {"hipblasSrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotm_v2", {"hipblasDrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotm_v2", {"hipblasSrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotm_v2", {"hipblasDrotm", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, // ROTMG - {"cublasSrotmg_v2", {"hipblasSrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, - {"cublasDrotmg_v2", {"hipblasDrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasSrotmg_v2", {"hipblasSrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, + {"cublasDrotmg_v2", {"hipblasDrotmg", CONV_MATH_FUNC, API_BLAS, HIP_UNSUPPORTED}}, ///////////////////////////// cuRAND ///////////////////////////// // RAND function call status types (enum curandStatus) diff --git a/projects/hip/tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu b/projects/hip/tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu new file mode 100644 index 0000000000..5dcaaaf637 --- /dev/null +++ b/projects/hip/tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu @@ -0,0 +1,79 @@ +// RUN: %run_test hipify "%s" "%t" %cuda_args + +#include +#include +#include +// CHECK: #include "hipblas.h" +#include "cublas.h" +#define M 6 +#define N 5 +#define IDX2C(i,j,ld) (((j)*(ld))+(i)) +static __inline__ void modify(float *m, int ldm, int n, int p, int q, float + alpha, float beta) { + // CHECK: hipblasSscal(n - p, alpha, &m[IDX2C(p, q, ldm)], ldm); + // CHECK: hipblasSscal(ldm - p, beta, &m[IDX2C(p, q, ldm)], 1); + cublasSscal(n - p, alpha, &m[IDX2C(p, q, ldm)], ldm); + cublasSscal(ldm - p, beta, &m[IDX2C(p, q, ldm)], 1); +} +int main(void) { + int i, j; + // CHECK: hipblasStatus_t stat; + cublasStatus stat; + float* devPtrA; + float* a = 0; + a = (float *)malloc(M * N * sizeof(*a)); + if (!a) { + printf("host memory allocation failed"); + return EXIT_FAILURE; + } + for (j = 0; j < N; j++) { + for (i = 0; i < M; i++) { + a[IDX2C(i, j, M)] = (float)(i * M + j + 1); + } + } + // cublasInit is not supported yet + cublasInit(); + stat = cublasAlloc(M*N, sizeof(*a), (void**)&devPtrA); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("device memory allocation failed"); + // cublasShutdown is not supported yet + cublasShutdown(); + return EXIT_FAILURE; + } + // CHECK: stat = hipblasSetMatrix(M, N, sizeof(*a), a, M, devPtrA, M); + stat = cublasSetMatrix(M, N, sizeof(*a), a, M, devPtrA, M); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("data download failed"); + // cublasFree is not supported yet + cublasFree(devPtrA); + // cublasShutdown is not supported yet + cublasShutdown(); + return EXIT_FAILURE; + } + modify(devPtrA, M, N, 1, 2, 16.0f, 12.0f); + // CHECK: stat = hipblasGetMatrix(M, N, sizeof(*a), devPtrA, M, a, M); + stat = cublasGetMatrix(M, N, sizeof(*a), devPtrA, M, a, M); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("data upload failed"); + // cublasFree is not supported yet + cublasFree(devPtrA); + // cublasShutdown is not supported yet + cublasShutdown(); + return EXIT_FAILURE; + } + // cublasFree is not supported yet + cublasFree(devPtrA); + // cublasShutdown is not supported yet + cublasShutdown(); + for (j = 0; j < N; j++) { + for (i = 0; i < M; i++) { + printf("%7.0f", a[IDX2C(i, j, M)]); + } + printf("\n"); + } + free(a); + return EXIT_SUCCESS; +} diff --git a/projects/hip/tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu b/projects/hip/tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu new file mode 100644 index 0000000000..4e3c1cace8 --- /dev/null +++ b/projects/hip/tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu @@ -0,0 +1,90 @@ +// RUN: %run_test hipify "%s" "%t" %cuda_args + +#include +#include +#include +// CHECK: #include +#include +// CHECK: #include "hipblas.h" +#include "cublas_v2.h" +#define M 6 +#define N 5 +#define IDX2F(i,j,ld) ((((j)-1)*(ld))+((i)-1)) +// CHECK: static __inline__ void modify(hipblasHandle_t handle, float *m, int ldm, int +static __inline__ void modify(cublasHandle_t handle, float *m, int ldm, int + n, int p, int q, float alpha, float beta) { + // CHECK: hipblasSscal(handle, n - p + 1, &alpha, &m[IDX2F(p, q, ldm)], ldm); + // CHECK: hipblasSscal(handle, ldm - p + 1, &beta, &m[IDX2F(p, q, ldm)], 1); + cublasSscal(handle, n - p + 1, &alpha, &m[IDX2F(p, q, ldm)], ldm); + cublasSscal(handle, ldm - p + 1, &beta, &m[IDX2F(p, q, ldm)], 1); +} +int main(void) { + // CHECK: hipError_t cudaStat; + // CHECK: hipblasStatus_t stat; + // CHECK: hipblasHandle_t handle; + cudaError_t cudaStat; + cublasStatus_t stat; + cublasHandle_t handle; + int i, j; + float* devPtrA; + float* a = 0; + a = (float *)malloc(M * N * sizeof(*a)); + if (!a) { + printf("host memory allocation failed"); + return EXIT_FAILURE; + } + for (j = 1; j <= N; j++) { + for (i = 1; i <= M; i++) { + a[IDX2F(i, j, M)] = (float)((i - 1) * M + j); + } + } + // CHECK: cudaStat = hipMalloc((void**)&devPtrA, M*N * sizeof(*a)); + cudaStat = cudaMalloc((void**)&devPtrA, M*N * sizeof(*a)); + // CHECK: if (cudaStat != hipSuccess) { + if (cudaStat != cudaSuccess) { + printf("device memory allocation failed"); + return EXIT_FAILURE; + } + // CHECK: stat = hipblasCreate(&handle); + stat = cublasCreate(&handle); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("CUBLAS initialization failed\n"); + return EXIT_FAILURE; + } + // CHECK: stat = hipblasSetMatrix(M, N, sizeof(*a), a, M, devPtrA, M); + stat = cublasSetMatrix(M, N, sizeof(*a), a, M, devPtrA, M); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("data download failed"); + // CHECK: hipFree(devPtrA); + // CHECK: hipblasDestroy(handle); + cudaFree(devPtrA); + cublasDestroy(handle); + return EXIT_FAILURE; + } + modify(handle, devPtrA, M, N, 2, 3, 16.0f, 12.0f); + // CHECK: stat = hipblasGetMatrix(M, N, sizeof(*a), devPtrA, M, a, M); + stat = cublasGetMatrix(M, N, sizeof(*a), devPtrA, M, a, M); + // CHECK: if (stat != HIPBLAS_STATUS_SUCCESS) { + if (stat != CUBLAS_STATUS_SUCCESS) { + printf("data upload failed"); + // CHECK: hipFree(devPtrA); + // CHECK: hipblasDestroy(handle); + cudaFree(devPtrA); + cublasDestroy(handle); + return EXIT_FAILURE; + } + // CHECK: hipFree(devPtrA); + // CHECK: hipblasDestroy(handle); + cudaFree(devPtrA); + cublasDestroy(handle); + for (j = 1; j <= N; j++) { + for (i = 1; i <= M; i++) { + printf("%7.0f", a[IDX2F(i, j, M)]); + } + printf("\n"); + } + free(a); + return EXIT_SUCCESS; +} diff --git a/projects/hip/tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu b/projects/hip/tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu new file mode 100644 index 0000000000..32692440d4 --- /dev/null +++ b/projects/hip/tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu @@ -0,0 +1,108 @@ +// RUN: %run_test hipify "%s" "%t" %cuda_args + +#include +#include +// CHECK: #include +#include +// CHECK: #include "hipblas.h" +#include "cublas_v2.h" +#define IDX2C(i,j,ld) (((j)*(ld))+(i)) +#define m 6 +#define n 4 +#define k 5 +int main(void) { + // CHECK: hipError_t cudaStat; + // CHECK: hipblasStatus_t stat; + // CHECK: hipblasHandle_t handle; + cudaError_t cudaStat; + cublasStatus_t stat; + cublasHandle_t handle; + int i, j; + float * a; + float * b; + float * c; + a = (float *)malloc(m*k * sizeof(float)); + b = (float *)malloc(k*n * sizeof(float)); + c = (float *)malloc(m*n * sizeof(float)); + int ind = 11; + for (j = 0; j Date: Wed, 25 Jul 2018 14:16:32 -0700 Subject: [PATCH 23/29] Remove device mapping from shareWithAll memory When shareWithAll memory (e.g., host memory) is allocated, set appId in hc::AmPointerInfo to -1 to indicate that this memory is not mapped to any device. Peer checking in ihipStream_t::canSeeMemory is not necessary if memory is shared with all devices. Thus, it is skipped. Note that earlier host memory is always mapped to device 0 and HIP always performs peer checking for all kinds of hipMemcpy. Since the peer checking process requires context locking, hipMemcpy from/to host memory always grabs device 0's context lock. Therefore, if there is another thread holding the context lock of device 0 (e.g., hipDeviceSynchronize on device 0), hipMemcpy will have to wait for the lock until it can actually perform memcpy. This can significantly deteriorate execution performance. Signed-off-by: Sarunya Pumma [ROCm/hip commit: 8111fd3b8bd9a46c372ca709e92bb160c2aeddf4] --- projects/hip/src/hip_hcc.cpp | 4 ++-- projects/hip/src/hip_memory.cpp | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/projects/hip/src/hip_hcc.cpp b/projects/hip/src/hip_hcc.cpp index c23bdf6dad..aecf75b717 100644 --- a/projects/hip/src/hip_hcc.cpp +++ b/projects/hip/src/hip_hcc.cpp @@ -1808,7 +1808,7 @@ bool ihipStream_t::canSeeMemory(const ihipCtx_t* copyEngineCtx, const hc::AmPoin // TODO - pointer-info stores a deviceID not a context,may have some unusual side-effects here: if (dstPtrInfo->_sizeBytes == 0) { return false; - } else { + } else if (dstPtrInfo->_appId != -1) { #if USE_APP_PTR_FOR_CTX ihipCtx_t* dstCtx = static_cast(dstPtrInfo->_appPtr); #else @@ -1831,7 +1831,7 @@ bool ihipStream_t::canSeeMemory(const ihipCtx_t* copyEngineCtx, const hc::AmPoin // TODO - pointer-info stores a deviceID not a context,may have some unusual side-effects here: if (srcPtrInfo->_sizeBytes == 0) { return false; - } else { + } else if (srcPtrInfo->_appId != -1) { #if USE_APP_PTR_FOR_CTX ihipCtx_t* srcCtx = static_cast(srcPtrInfo->_appPtr); #else diff --git a/projects/hip/src/hip_memory.cpp b/projects/hip/src/hip_memory.cpp index d6c04ae98c..dc5390f014 100644 --- a/projects/hip/src/hip_memory.cpp +++ b/projects/hip/src/hip_memory.cpp @@ -61,19 +61,20 @@ int sharePtr(void* ptr, ihipCtx_t* ctx, bool shareWithAll, unsigned hipFlags) { auto device = ctx->getWriteableDevice(); -#if USE_APP_PTR_FOR_CTX - hc::am_memtracker_update(ptr, device->_deviceId, hipFlags, ctx); -#else - hc::am_memtracker_update(ptr, device->_deviceId, hipFlags); -#endif - if (shareWithAll) { + // shareWithAll memory is not mapped to any device + hc::am_memtracker_update(ptr, -1, hipFlags); hsa_status_t s = hsa_amd_agents_allow_access(g_deviceCnt + 1, g_allAgents, NULL, ptr); tprintf(DB_MEM, " allow access to CPU + all %d GPUs (shareWithAll)\n", g_deviceCnt); if (s != HSA_STATUS_SUCCESS) { ret = -1; } } else { +#if USE_APP_PTR_FOR_CTX + hc::am_memtracker_update(ptr, device->_deviceId, hipFlags, ctx); +#else + hc::am_memtracker_update(ptr, device->_deviceId, hipFlags); +#endif int peerCnt = 0; { LockedAccessor_CtxCrit_t crit(ctx->criticalData()); From 390fedfb354ec5eae0c287200a49f69a1db75b7b Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Mon, 30 Jul 2018 19:34:05 +0000 Subject: [PATCH 24/29] Ensure correct vector value type used in texture Implement the vector value types in terms of SCALAR_TYPE##SIZE_vector_value_type for float, int, uint and sizes 2, 3, 4, 8, and 16. [ROCm/hip commit: e0e785a45d1ff3f0e98cd04103f057ead3b83be5] --- .../hip/hcc_detail/texture_functions.h | 2571 +++++++++-------- 1 file changed, 1291 insertions(+), 1280 deletions(-) diff --git a/projects/hip/include/hip/hcc_detail/texture_functions.h b/projects/hip/include/hip/hcc_detail/texture_functions.h index 0c221c1997..892b39780a 100644 --- a/projects/hip/include/hip/hcc_detail/texture_functions.h +++ b/projects/hip/include/hip/hcc_detail/texture_functions.h @@ -26,10 +26,21 @@ THE SOFTWARE. #include #include +#define TYPEDEF_VECTOR_VALUE_TYPE(SCALAR_TYPE) \ +typedef SCALAR_TYPE SCALAR_TYPE##2_vector_value_type __attribute__((ext_vector_type(2))); \ +typedef SCALAR_TYPE SCALAR_TYPE##3_vector_value_type __attribute__((ext_vector_type(3))); \ +typedef SCALAR_TYPE SCALAR_TYPE##4_vector_value_type __attribute__((ext_vector_type(4))); \ +typedef SCALAR_TYPE SCALAR_TYPE##8_vector_value_type __attribute__((ext_vector_type(8))); \ +typedef SCALAR_TYPE SCALAR_TYPE##16_vector_value_type __attribute__((ext_vector_type(16))); + +TYPEDEF_VECTOR_VALUE_TYPE(float); +TYPEDEF_VECTOR_VALUE_TYPE(int); +TYPEDEF_VECTOR_VALUE_TYPE(uint); + union TData { - float4 f; - int4 i; - uint4 u; + float4_vector_value_type f; + int4_vector_value_type i; + uint4_vector_value_type u; }; #define __TEXTURE_FUNCTIONS_DECL__ static __inline__ __device__ @@ -154,110 +165,110 @@ union TData { extern "C" { __device__ -float4 __ockl_image_sample_1D( +float4_vector_value_type __ockl_image_sample_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c); __device__ -float4 __ockl_image_sample_1Da( +float4_vector_value_type __ockl_image_sample_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c); + float2_vector_value_type c); __device__ -float4 __ockl_image_sample_2D( +float4_vector_value_type __ockl_image_sample_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c); + float2_vector_value_type c); __device__ -float4 __ockl_image_sample_2Da( +float4_vector_value_type __ockl_image_sample_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c); + float4_vector_value_type c); __device__ float __ockl_image_sample_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c); + float4_vector_value_type c); __device__ float __ockl_image_sample_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c); + float2_vector_value_type c); __device__ -float4 __ockl_image_sample_3D( +float4_vector_value_type __ockl_image_sample_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c); + float4_vector_value_type c); __device__ -float4 __ockl_image_sample_grad_1D( +float4_vector_value_type __ockl_image_sample_grad_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float dx, float dy); __device__ -float4 __ockl_image_sample_grad_1Da( +float4_vector_value_type __ockl_image_sample_grad_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float dx, float dy); + float2_vector_value_type c, float dx, float dy); __device__ -float4 __ockl_image_sample_grad_2D( +float4_vector_value_type __ockl_image_sample_grad_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float2 dx, float2 dy); + float2_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); __device__ -float4 __ockl_image_sample_grad_2Da( +float4_vector_value_type __ockl_image_sample_grad_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float2 dx, float2 dy); + float4_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); __device__ float __ockl_image_sample_grad_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float2 dx, float2 dy); + float4_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); __device__ float __ockl_image_sample_grad_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float2 dx, float2 dy); + float2_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); __device__ -float4 __ockl_image_sample_grad_3D( +float4_vector_value_type __ockl_image_sample_grad_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float4 dx, float4 dy); + float4_vector_value_type c, float4_vector_value_type dx, float4_vector_value_type dy); __device__ -float4 __ockl_image_sample_lod_1D( +float4_vector_value_type __ockl_image_sample_lod_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float l); __device__ -float4 __ockl_image_sample_lod_1Da( +float4_vector_value_type __ockl_image_sample_lod_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float l); + float2_vector_value_type c, float l); __device__ -float4 __ockl_image_sample_lod_2D( +float4_vector_value_type __ockl_image_sample_lod_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float l); + float2_vector_value_type c, float l); __device__ -float4 __ockl_image_sample_lod_2Da( +float4_vector_value_type __ockl_image_sample_lod_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float l); + float4_vector_value_type c, float l); __device__ float __ockl_image_sample_lod_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float l); + float4_vector_value_type c, float l); __device__ float __ockl_image_sample_lod_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2 c, float l); + float2_vector_value_type c, float l); __device__ -float4 __ockl_image_sample_lod_3D( +float4_vector_value_type __ockl_image_sample_lod_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4 c, float l); + float4_vector_value_type c, float l); } //////////////////////////////////////////////////////////// @@ -1045,196 +1056,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex1DGrad(hipTextureObject_t textureObject, float x __TEXTURE_FUNCTIONS_DECL__ void tex2D(char* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(char4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uchar4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(short4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(ushort4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(int4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(uint4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float1* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float2* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2D(float4* retVal, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_SET_FLOAT_XYZW; } @@ -1249,196 +1260,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex2D(hipTextureObject_t textureObject, float x, fl __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(char4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(short4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(int4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float1* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float2* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex2DLod(float4* retVal, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_SET_FLOAT_XYZW; } @@ -1454,196 +1465,196 @@ __TEXTURE_FUNCTIONS_DECL__ T tex2DLod(hipTextureObject_t textureObject, float x, __TEXTURE_FUNCTIONS_DECL__ void tex3D(char* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(char4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(short4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(int4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float1* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float2* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex3D(float4* retVal, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_SET_FLOAT_XYZW; } @@ -1658,7 +1669,7 @@ __TEXTURE_FUNCTIONS_DECL__ T tex3D(hipTextureObject_t textureObject, float x, fl __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -1666,7 +1677,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -1674,7 +1685,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char1* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -1682,7 +1693,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char2* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -1690,7 +1701,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(char4* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned char* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -1698,7 +1709,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned char* retVal, hipTextureObject __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -1706,7 +1717,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -1714,7 +1725,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1722,7 +1733,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uchar4* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -1730,7 +1741,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -1738,7 +1749,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -1746,7 +1757,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -1754,7 +1765,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(short4* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned short* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -1762,7 +1773,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned short* retVal, hipTextureObjec __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -1770,7 +1781,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort1* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -1778,7 +1789,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort2* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1786,7 +1797,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(ushort4* retVal, hipTextureObject_t tex __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -1794,7 +1805,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int* retVal, hipTextureObject_t texture __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -1802,7 +1813,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int1* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -1810,7 +1821,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int2* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -1818,7 +1829,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(int4* retVal, hipTextureObject_t textur __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned int* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -1826,7 +1837,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(unsigned int* retVal, hipTextureObject_ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -1834,7 +1845,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint1* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -1842,7 +1853,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint2* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -1850,7 +1861,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(uint4* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_FLOAT; } @@ -1858,7 +1869,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float* retVal, hipTextureObject_t textu __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float1* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_FLOAT_X; } @@ -1866,7 +1877,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float1* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float2* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_FLOAT_XY; } @@ -1874,7 +1885,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float2* retVal, hipTextureObject_t text __TEXTURE_FUNCTIONS_DECL__ void tex3DLod(float4* retVal, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_SET_FLOAT_XYZW; } @@ -1891,189 +1902,189 @@ __TEXTURE_FUNCTIONS_DECL__ T tex3DLod(hipTextureObject_t textureObject, float x, __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(char4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned char* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uchar4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(short4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned short* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(ushort4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(int4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_SIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(unsigned int* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(uint4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_UNSIGNED_XYZW; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_FLOAT; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float1* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_FLOAT_X; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float2* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_FLOAT_XY; } __TEXTURE_FUNCTIONS_DECL__ void tex1DLayered(float4* retVal, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_SET_FLOAT_XYZW; } @@ -2089,7 +2100,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED; } @@ -2097,7 +2108,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char1* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_X; } @@ -2105,7 +2116,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char2* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2113,7 +2124,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(char4* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2122,7 +2133,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned char* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED; } @@ -2130,7 +2141,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2138,7 +2149,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2146,7 +2157,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uchar4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2154,7 +2165,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED; } @@ -2162,7 +2173,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_X; } @@ -2170,7 +2181,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2178,7 +2189,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(short4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2187,7 +2198,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned short* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED; } @@ -2195,7 +2206,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort1* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2203,7 +2214,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort2* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2211,7 +2222,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(ushort4* retVal, hipTextureObjec float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2219,7 +2230,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED; } @@ -2227,7 +2238,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int1* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_X; } @@ -2235,7 +2246,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int2* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2243,7 +2254,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(int4* retVal, hipTextureObject_t float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2252,7 +2263,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(unsigned int* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED; } @@ -2260,7 +2271,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint1* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2268,7 +2279,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint2* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2276,7 +2287,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(uint4* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2284,7 +2295,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float* retVal, hipTextureObject_ float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_FLOAT; } @@ -2292,7 +2303,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float1* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_FLOAT_X; } @@ -2300,7 +2311,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float2* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_FLOAT_XY; } @@ -2308,7 +2319,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredLod(float4* retVal, hipTextureObject float x, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_SET_FLOAT_XYZW; } @@ -2325,7 +2336,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED; } @@ -2333,7 +2344,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char1* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2341,7 +2352,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char2* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2349,7 +2360,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(char4* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2358,7 +2369,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned char* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2366,7 +2377,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2374,7 +2385,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2382,7 +2393,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uchar4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2390,7 +2401,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED; } @@ -2398,7 +2409,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2406,7 +2417,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2414,7 +2425,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(short4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2423,7 +2434,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned short* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2431,7 +2442,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort1* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2439,7 +2450,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort2* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2447,7 +2458,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(ushort4* retVal, hipTextureObje float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2455,7 +2466,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int* retVal, hipTextureObject_t float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED; } @@ -2463,7 +2474,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int1* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_X; } @@ -2471,7 +2482,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int2* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XY; } @@ -2479,7 +2490,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(int4* retVal, hipTextureObject_ float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_SIGNED_XYZW; } @@ -2488,7 +2499,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(unsigned int* retVal, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED; } @@ -2496,7 +2507,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint1* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_X; } @@ -2504,7 +2515,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint2* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XY; } @@ -2512,7 +2523,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(uint4* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2520,7 +2531,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float* retVal, hipTextureObject float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_FLOAT; } @@ -2528,7 +2539,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float1* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_FLOAT_X; } @@ -2536,7 +2547,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float2* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_FLOAT_XY; } @@ -2544,7 +2555,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex1DLayeredGrad(float4* retVal, hipTextureObjec float x, int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_SET_FLOAT_XYZW; } @@ -2561,7 +2572,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED; } @@ -2569,7 +2580,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char1* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_X; } @@ -2577,7 +2588,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char2* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XY; } @@ -2585,7 +2596,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(char4* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } @@ -2594,7 +2605,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned char* retVal, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED; } @@ -2602,7 +2613,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } @@ -2610,7 +2621,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } @@ -2618,7 +2629,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uchar4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2626,7 +2637,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED; } @@ -2634,7 +2645,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_X; } @@ -2642,7 +2653,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XY; } @@ -2650,7 +2661,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(short4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } @@ -2659,7 +2670,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned short* retVal, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED; } @@ -2667,7 +2678,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } @@ -2675,7 +2686,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } @@ -2683,7 +2694,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(ushort4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2691,7 +2702,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int* retVal, hipTextureObject_t tex float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED; } @@ -2699,7 +2710,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int1* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_X; } @@ -2707,7 +2718,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int2* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XY; } @@ -2715,7 +2726,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(int4* retVal, hipTextureObject_t te float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_SIGNED_XYZW; } @@ -2723,7 +2734,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(unsigned int* retVal, hipTextureObj float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED; } @@ -2731,7 +2742,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint1* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_X; } @@ -2739,7 +2750,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint2* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XY; } @@ -2747,7 +2758,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(uint4* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2755,7 +2766,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float* retVal, hipTextureObject_t t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_FLOAT; } @@ -2763,7 +2774,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float1* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_FLOAT_X; } @@ -2771,7 +2782,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float2* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_FLOAT_XY; } @@ -2779,7 +2790,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayered(float4* retVal, hipTextureObject_t float x, float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_SET_FLOAT_XYZW; } @@ -2796,7 +2807,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -2804,7 +2815,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char1* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -2812,7 +2823,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char2* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2820,7 +2831,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(char4* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2829,7 +2840,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned char* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -2837,7 +2848,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2845,7 +2856,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2853,7 +2864,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uchar4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2861,7 +2872,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -2869,7 +2880,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -2877,7 +2888,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2885,7 +2896,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(short4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2894,7 +2905,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned short* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -2902,7 +2913,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort1* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2910,7 +2921,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort2* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2918,7 +2929,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(ushort4* retVal, hipTextureObjec float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2926,7 +2937,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED; } @@ -2934,7 +2945,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int1* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_X; } @@ -2942,7 +2953,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int2* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XY; } @@ -2950,7 +2961,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(int4* retVal, hipTextureObject_t float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_SIGNED_XYZW; } @@ -2959,7 +2970,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(unsigned int* retVal, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED; } @@ -2967,7 +2978,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint1* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_X; } @@ -2975,7 +2986,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint2* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XY; } @@ -2983,7 +2994,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(uint4* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_UNSIGNED_XYZW; } @@ -2991,7 +3002,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float* retVal, hipTextureObject_ float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_FLOAT; } @@ -2999,7 +3010,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float1* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_FLOAT_X; } @@ -3007,7 +3018,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float2* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_FLOAT_XY; } @@ -3015,7 +3026,7 @@ __TEXTURE_FUNCTIONS_DECL__ void tex2DLayeredLod(float4* retVal, hipTextureObject float x, float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_SET_FLOAT_XYZW; } @@ -4819,28 +4830,28 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DGrad(texture texRe template __TEXTURE_FUNCTIONS_DECL__ char tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR; } template __TEXTURE_FUNCTIONS_DECL__ char1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_X; } template __TEXTURE_FUNCTIONS_DECL__ char2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_XY; } template __TEXTURE_FUNCTIONS_DECL__ char4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -4848,56 +4859,56 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR; } template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_X; } template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_XY; } template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_XYZW; } template __TEXTURE_FUNCTIONS_DECL__ short tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT; } template __TEXTURE_FUNCTIONS_DECL__ short1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_X; } template __TEXTURE_FUNCTIONS_DECL__ short2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_XY; } template __TEXTURE_FUNCTIONS_DECL__ short4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -4905,56 +4916,56 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT; } template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_X; } template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_XY; } template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_XYZW; } template __TEXTURE_FUNCTIONS_DECL__ int tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT; } template __TEXTURE_FUNCTIONS_DECL__ int1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_X; } template __TEXTURE_FUNCTIONS_DECL__ int2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_XY; } template __TEXTURE_FUNCTIONS_DECL__ int4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_XYZW; } @@ -4962,28 +4973,28 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT; } template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_X; } template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_XY; } template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -4994,7 +5005,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR; } @@ -5002,7 +5013,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_X; } @@ -5010,7 +5021,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_XY; } @@ -5018,7 +5029,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -5026,7 +5037,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR; } @@ -5034,7 +5045,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_X; } @@ -5042,7 +5053,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_XY; } @@ -5050,7 +5061,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5058,7 +5069,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT; } @@ -5066,7 +5077,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_X; } @@ -5074,7 +5085,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_XY; } @@ -5082,7 +5093,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -5091,7 +5102,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2D(texture __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_X; } @@ -5107,7 +5118,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_XY; } @@ -5115,7 +5126,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -5123,7 +5134,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT; } @@ -5131,7 +5142,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_X; } @@ -5139,7 +5150,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_XY; } @@ -5147,7 +5158,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_INT_XYZW; } @@ -5155,7 +5166,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT; } @@ -5163,7 +5174,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_X; } @@ -5171,7 +5182,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_XY; } @@ -5179,7 +5190,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -5187,21 +5198,21 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT; } template __TEXTURE_FUNCTIONS_DECL__ float tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT; } template __TEXTURE_FUNCTIONS_DECL__ float1 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_X; } @@ -5209,14 +5220,14 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_X; } template __TEXTURE_FUNCTIONS_DECL__ float2 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_XY; } @@ -5224,14 +5235,14 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_XY; } template __TEXTURE_FUNCTIONS_DECL__ float4 tex2D(texture texRef, float x, float y) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5239,7 +5250,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2D(texture texRef, hipTextureObject_t textureObject, float x, float y) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_2D(i, s, float2(x, y)); + texel.f = __ockl_image_sample_2D(i, s, float2(x, y).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5249,7 +5260,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR; } @@ -5257,7 +5268,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_X; } @@ -5265,7 +5276,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -5273,7 +5284,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -5281,7 +5292,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR; } @@ -5289,7 +5300,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -5297,7 +5308,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -5305,7 +5316,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5313,7 +5324,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT; } @@ -5321,7 +5332,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_X; } @@ -5329,7 +5340,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -5337,7 +5348,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -5345,7 +5356,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT; } @@ -5353,7 +5364,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_X; } @@ -5361,7 +5372,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_XY; } @@ -5369,7 +5380,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_XYZW; } @@ -5377,7 +5388,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT; } @@ -5385,7 +5396,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_X; } @@ -5393,7 +5404,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_XY; } @@ -5401,7 +5412,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -5409,7 +5420,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT; } @@ -5417,7 +5428,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_X; } @@ -5425,7 +5436,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_XY; } @@ -5433,7 +5444,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -5441,7 +5452,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT; } @@ -5449,7 +5460,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -5457,7 +5468,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -5465,7 +5476,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLod(texture texRef, float x, float y, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5476,7 +5487,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR; } @@ -5485,7 +5496,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_X; } @@ -5494,7 +5505,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -5503,7 +5514,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -5512,7 +5523,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -5530,7 +5541,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -5539,7 +5550,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5548,7 +5559,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT; } @@ -5557,7 +5568,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_X; } @@ -5566,7 +5577,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -5575,7 +5586,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -5584,7 +5595,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_X; } @@ -5602,7 +5613,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_XY; } @@ -5611,7 +5622,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLod(texture texR hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_USHORT_XYZW; } @@ -5620,7 +5631,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT; } @@ -5629,7 +5640,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_X; } @@ -5638,7 +5649,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_XY; } @@ -5647,7 +5658,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -5656,7 +5667,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_X; } @@ -5674,7 +5685,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_XY; } @@ -5683,7 +5694,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -5692,7 +5703,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT; } @@ -5701,7 +5712,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -5710,7 +5721,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -5719,7 +5730,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y), level); + texel.f = __ockl_image_sample_lod_2D(i, s, float2(x, y).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -5729,9 +5740,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR; } @@ -5739,9 +5750,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_X; } @@ -5749,9 +5760,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XY; } @@ -5759,9 +5770,9 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -5769,9 +5780,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR; } @@ -5779,9 +5790,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_X; } @@ -5789,9 +5800,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_XY; } @@ -5799,9 +5810,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -5809,9 +5820,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT; } @@ -5819,9 +5830,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_X; } @@ -5829,9 +5840,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_XY; } @@ -5839,9 +5850,9 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -5849,9 +5860,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT; } @@ -5859,9 +5870,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_X; } @@ -5869,9 +5880,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_XY; } @@ -5879,9 +5890,9 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -5889,9 +5900,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT; } @@ -5899,9 +5910,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_X; } @@ -5909,9 +5920,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XY; } @@ -5919,9 +5930,9 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XYZW; } @@ -5929,9 +5940,9 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT; } @@ -5939,9 +5950,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_X; } @@ -5949,9 +5960,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XY; } @@ -5959,9 +5970,9 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -5969,9 +5980,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT; } @@ -5979,9 +5990,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_X; } @@ -5989,9 +6000,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_XY; } @@ -5999,9 +6010,9 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex2DGrad(texture texRef, float x, float y, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6012,9 +6023,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR; } @@ -6023,9 +6034,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_X; } @@ -6034,9 +6045,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XY; } @@ -6045,9 +6056,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -6056,9 +6067,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_X; } @@ -6078,9 +6089,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_XY; } @@ -6089,9 +6100,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6100,9 +6111,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT; } @@ -6111,9 +6122,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_X; } @@ -6122,9 +6133,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_XY; } @@ -6133,9 +6144,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -6144,9 +6155,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_X; } @@ -6166,9 +6177,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_XY; } @@ -6177,9 +6188,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DGrad(texture tex hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -6188,9 +6199,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT; } @@ -6199,9 +6210,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_X; } @@ -6210,9 +6221,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XY; } @@ -6221,9 +6232,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XYZW; } @@ -6232,9 +6243,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_X; } @@ -6254,9 +6265,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XY; } @@ -6265,9 +6276,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -6276,9 +6287,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DGrad(texture texRef, hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT; } @@ -6287,9 +6298,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_X; } @@ -6298,9 +6309,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_XY; } @@ -6309,9 +6320,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DGrad(texture texRe hipTextureObject_t textureObject, float x, float y, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + texel.f = __ockl_image_sample_grad_2D(i, s, float2(x, y).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6321,7 +6332,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR; } @@ -6329,7 +6340,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_X; } @@ -6337,7 +6348,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_XY; } @@ -6345,7 +6356,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -6353,7 +6364,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR; } @@ -6361,7 +6372,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_X; } @@ -6369,7 +6380,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_XY; } @@ -6377,7 +6388,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6385,7 +6396,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT; } @@ -6393,7 +6404,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_X; } @@ -6401,7 +6412,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_XY; } @@ -6409,7 +6420,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -6417,7 +6428,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT; } @@ -6425,7 +6436,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_X; } @@ -6433,7 +6444,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_XY; } @@ -6441,7 +6452,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -6449,7 +6460,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT; } @@ -6457,7 +6468,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_X; } @@ -6465,7 +6476,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_XY; } @@ -6473,7 +6484,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_XYZW; } @@ -6481,7 +6492,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT; } @@ -6489,7 +6500,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_X; } @@ -6497,7 +6508,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_XY; } @@ -6505,7 +6516,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_XYZW; } @@ -6513,7 +6524,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT; } @@ -6521,7 +6532,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_X; } @@ -6529,7 +6540,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_XY; } @@ -6537,7 +6548,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex3D(texture texRef, float x, float y, float z) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6547,7 +6558,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR; } @@ -6556,7 +6567,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_X; } @@ -6565,7 +6576,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_XY; } @@ -6574,7 +6585,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -6583,7 +6594,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_X; } @@ -6601,7 +6612,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_XY; } @@ -6610,7 +6621,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6619,7 +6630,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT; } @@ -6628,7 +6639,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_X; } @@ -6637,7 +6648,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_XY; } @@ -6646,7 +6657,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -6655,7 +6666,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_X; } @@ -6673,7 +6684,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_XY; } @@ -6682,7 +6693,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -6690,7 +6701,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT; } @@ -6698,7 +6709,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_X; } @@ -6706,7 +6717,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_XY; } @@ -6714,7 +6725,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_INT_XYZW; } @@ -6723,7 +6734,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_X; } @@ -6741,7 +6752,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_XY; } @@ -6750,7 +6761,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_UINT_XYZW; } @@ -6759,7 +6770,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT; } @@ -6768,7 +6779,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_X; } @@ -6777,7 +6788,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_XY; } @@ -6786,7 +6797,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3D(texture texRef, hipTextureObject_t textureObject, float x, float y, float z) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f)); + texel.f = __ockl_image_sample_3D(i, s, float4(x, y, z, 0.0f).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6796,7 +6807,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR; } @@ -6805,7 +6816,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_X; } @@ -6814,7 +6825,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -6823,7 +6834,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -6832,7 +6843,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR; } @@ -6841,7 +6852,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -6850,7 +6861,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -6859,7 +6870,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -6868,7 +6879,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT; } @@ -6877,7 +6888,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_X; } @@ -6886,7 +6897,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_XY; } @@ -6895,7 +6906,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -6904,7 +6915,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT; } @@ -6913,7 +6924,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_X; } @@ -6922,7 +6933,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_XY; } @@ -6931,7 +6942,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -6940,7 +6951,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT; } @@ -6949,7 +6960,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -6958,7 +6969,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -6967,7 +6978,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex3DLod(texture texRef, float x, float y, float z, float level) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -6979,7 +6990,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR; } @@ -6989,7 +7000,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_X; } @@ -6999,7 +7010,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -7009,7 +7020,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -7019,7 +7030,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -7039,7 +7050,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -7049,7 +7060,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7059,7 +7070,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT; } @@ -7069,7 +7080,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_X; } @@ -7079,7 +7090,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_XY; } @@ -7089,7 +7100,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -7099,7 +7110,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_X; } @@ -7119,7 +7130,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_XY; } @@ -7129,7 +7140,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -7139,7 +7150,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DLod(texture texRef, hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT; } @@ -7149,7 +7160,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -7159,7 +7170,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -7169,7 +7180,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DLod(texture texRef hipTextureObject_t textureObject, float x, float y, float z, float level) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f), + texel.f = __ockl_image_sample_lod_3D(i, s, float4(x, y, z, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7181,9 +7192,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR; } @@ -7192,9 +7203,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_X; } @@ -7203,9 +7214,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_XY; } @@ -7214,9 +7225,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -7226,9 +7237,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_X; } @@ -7248,9 +7259,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_XY; } @@ -7259,9 +7270,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7270,9 +7281,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT; } @@ -7281,9 +7292,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_X; } @@ -7292,9 +7303,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_XY; } @@ -7303,9 +7314,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -7315,9 +7326,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_X; } @@ -7337,9 +7348,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_XY; } @@ -7348,9 +7359,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3DGrad(texture tex float y, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -7359,9 +7370,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DGrad(texture texRef, flo float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT; } @@ -7370,9 +7381,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_X; } @@ -7381,9 +7392,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_XY; } @@ -7392,9 +7403,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DGrad(texture texRef, f float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_XYZW; } @@ -7403,9 +7414,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_X; } @@ -7425,9 +7436,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_XY; } @@ -7436,9 +7447,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_XYZW; } @@ -7447,9 +7458,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT; } @@ -7458,9 +7469,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_X; } @@ -7469,9 +7480,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_XY; } @@ -7480,9 +7491,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7493,9 +7504,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR; } @@ -7505,9 +7516,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_X; } @@ -7517,9 +7528,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_XY; } @@ -7529,9 +7540,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -7541,9 +7552,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_X; } @@ -7565,9 +7576,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_XY; } @@ -7577,9 +7588,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7589,9 +7600,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT; } @@ -7601,9 +7612,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_X; } @@ -7613,9 +7624,9 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_XY; } @@ -7625,9 +7636,9 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -7637,9 +7648,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_X; } @@ -7661,9 +7672,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_XY; } @@ -7673,9 +7684,9 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex3DGrad(texture tex float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -7685,9 +7696,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT; } @@ -7697,9 +7708,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_X; } @@ -7709,9 +7720,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_XY; } @@ -7721,9 +7732,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_INT_XYZW; } @@ -7733,9 +7744,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_X; } @@ -7757,9 +7768,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_XY; } @@ -7769,9 +7780,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_UINT_XYZW; } @@ -7781,9 +7792,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex3DGrad(texture texRef, float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT; } @@ -7793,9 +7804,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_X; } @@ -7805,9 +7816,9 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_XY; } @@ -7817,9 +7828,9 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex3DGrad(texture texRe float z, float4 dx, float4 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f), - float4(dx.x, dx.y, dx.z, dx.w), - float4(dy.x, dy.y, dy.z, dy.w)); + __ockl_image_sample_grad_3D(i, s, float4(x, y, z, 0.0f).data, + float4(dx.x, dx.y, dx.z, dx.w).data, + float4(dy.x, dy.y, dy.z, dy.w).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -7829,7 +7840,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR; } @@ -7837,7 +7848,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_X; } @@ -7845,7 +7856,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_XY; } @@ -7853,7 +7864,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -7861,7 +7872,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR; } @@ -7869,7 +7880,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_X; } @@ -7877,7 +7888,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_XY; } @@ -7885,7 +7896,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -7893,7 +7904,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT; } @@ -7901,7 +7912,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_X; } @@ -7909,7 +7920,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_XY; } @@ -7917,7 +7928,7 @@ template __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -7925,7 +7936,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayered( texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT; } @@ -7933,7 +7944,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_X; } @@ -7941,7 +7952,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_XY; } @@ -7949,7 +7960,7 @@ template __TEXTURE_FUNCTIONS_DECL__ ushort4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -7957,7 +7968,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT; } @@ -7965,7 +7976,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_X; } @@ -7973,7 +7984,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_XY; } @@ -7981,7 +7992,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_XYZW; } @@ -7989,7 +8000,7 @@ template __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT; } @@ -7997,7 +8008,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_X; } @@ -8005,7 +8016,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_XY; } @@ -8013,7 +8024,7 @@ template __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_XYZW; } @@ -8021,7 +8032,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT; } @@ -8029,7 +8040,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_X; } @@ -8037,7 +8048,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_XY; } @@ -8045,7 +8056,7 @@ template __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayered(texture texRef, float x, int layer) { TEXTURE_REF_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8055,7 +8066,7 @@ template __TEXTURE_FUNCTIONS_DECL__ char tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR; } @@ -8064,7 +8075,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_X; } @@ -8073,7 +8084,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_XY; } @@ -8082,7 +8093,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -8091,7 +8102,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_X; } @@ -8109,7 +8120,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_XY; } @@ -8118,7 +8129,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8127,7 +8138,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT; } @@ -8136,7 +8147,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_X; } @@ -8145,7 +8156,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_XY; } @@ -8154,7 +8165,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -8163,7 +8174,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayered( texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT; } @@ -8172,7 +8183,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_X; } @@ -8181,7 +8192,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_XY; } @@ -8190,7 +8201,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex1DLayered(texture hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -8198,7 +8209,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT; } @@ -8206,7 +8217,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_X; } @@ -8214,7 +8225,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_XY; } @@ -8222,7 +8233,7 @@ template __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayered(texture texRef, hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_INT_XYZW; } @@ -8231,7 +8242,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_X; } @@ -8249,7 +8260,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_XY; } @@ -8258,7 +8269,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_UINT_XYZW; } @@ -8267,7 +8278,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayered(texture texR hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT; } @@ -8276,7 +8287,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_X; } @@ -8285,7 +8296,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_XY; } @@ -8294,7 +8305,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayered(texture te hipTextureObject_t textureObject, float x, int layer) { TEXTURE_PARAMETERS_INIT; - texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer)); + texel.f = __ockl_image_sample_1Da(i, s, float2(x, layer).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8305,7 +8316,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR; } @@ -8314,7 +8325,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_X; } @@ -8323,7 +8334,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -8332,7 +8343,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -8341,7 +8352,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredLod( texture texRef, float x, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR; } @@ -8350,7 +8361,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -8359,7 +8370,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -8368,7 +8379,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8377,7 +8388,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT; } @@ -8386,7 +8397,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_X; } @@ -8395,7 +8406,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -8404,7 +8415,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -8413,7 +8424,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredLod( texture texRef, float x, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_USHORT; } @@ -8422,7 +8433,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredLod(texture texRe int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT; } @@ -8458,7 +8469,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_X; } @@ -8467,7 +8478,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_XY; } @@ -8476,7 +8487,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -8485,7 +8496,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_X; } @@ -8503,7 +8514,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_XY; } @@ -8512,7 +8523,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -8521,7 +8532,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredLod(texture t int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT; } @@ -8530,7 +8541,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -8539,7 +8550,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -8548,7 +8559,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8560,7 +8571,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR; } @@ -8570,7 +8581,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_X; } @@ -8580,7 +8591,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -8590,7 +8601,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -8600,7 +8611,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredLod( int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR; } @@ -8610,7 +8621,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -8620,7 +8631,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -8630,7 +8641,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -8640,7 +8651,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT; } @@ -8650,7 +8661,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_X; } @@ -8660,7 +8671,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -8670,7 +8681,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -8680,7 +8691,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredLod( int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_USHORT; } @@ -8690,7 +8701,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredLod(texture texRe float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT; } @@ -8730,7 +8741,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_X; } @@ -8740,7 +8751,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_XY; } @@ -8750,7 +8761,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -8760,7 +8771,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_X; } @@ -8780,7 +8791,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_XY; } @@ -8790,7 +8801,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -8800,7 +8811,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT; } @@ -8810,7 +8821,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -8820,7 +8831,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -8830,7 +8841,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex1DLayeredLod(texture int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_lod_1Da(i, s, float2(x, layer), level); + __ockl_image_sample_lod_1Da(i, s, float2(x, layer).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -8841,7 +8852,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR; } @@ -8851,7 +8862,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR; } @@ -8860,7 +8871,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_X; } @@ -8870,7 +8881,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_X; } @@ -8879,7 +8890,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_XY; } @@ -8889,7 +8900,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_XY; } @@ -8898,7 +8909,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_XYZW; } @@ -8908,7 +8919,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_CHAR_XYZW; } @@ -8917,7 +8928,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredGrad( texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UCHAR; } @@ -8927,7 +8938,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UCHAR; } @@ -8936,7 +8947,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_SHORT; } @@ -9003,7 +9014,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_SHORT; } @@ -9012,7 +9023,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex1DLayeredGrad(texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_USHORT; } @@ -9079,7 +9090,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_USHORT; } @@ -9088,7 +9099,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex1DLayeredGrad(texture texR int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT; } @@ -9155,7 +9166,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex1DLayeredGrad(texture texR int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT; } @@ -9164,7 +9175,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_X; } @@ -9174,7 +9185,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_X; } @@ -9183,7 +9194,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_XY; } @@ -9193,7 +9204,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_XY; } @@ -9202,7 +9213,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_XYZW; } @@ -9212,7 +9223,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex1DLayeredGrad(texture te int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_INT_XYZW; } @@ -9221,7 +9232,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredGrad( texture texRef, float x, int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT; } @@ -9231,7 +9242,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex1DLayeredGrad( int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT; } @@ -9240,7 +9251,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_X; } @@ -9250,7 +9261,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_X; } @@ -9259,7 +9270,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_XY; } @@ -9269,7 +9280,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_XY; } @@ -9278,7 +9289,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_XYZW; } @@ -9288,7 +9299,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_UINT_XYZW; } @@ -9297,7 +9308,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_FLOAT; } @@ -9307,7 +9318,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex1DLayeredGrad(texture int layer, float dx, float dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_1Da(i, s, float2(x, layer), dx, dy); + __ockl_image_sample_grad_1Da(i, s, float2(x, layer).data, dx, dy); TEXTURE_RETURN_FLOAT; } @@ -9316,7 +9327,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex1DLayeredGrad(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR; } @@ -9385,7 +9396,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR; } @@ -9394,7 +9405,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_X; } @@ -9404,7 +9415,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_X; } @@ -9413,7 +9424,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_XY; } @@ -9423,7 +9434,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_XY; } @@ -9432,7 +9443,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -9442,7 +9453,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -9451,7 +9462,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_X; } @@ -9480,7 +9491,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_X; } @@ -9489,7 +9500,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_XY; } @@ -9499,7 +9510,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_XY; } @@ -9508,7 +9519,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -9518,7 +9529,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UCHAR_XYZW; } @@ -9527,7 +9538,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT; } @@ -9537,7 +9548,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT; } @@ -9546,7 +9557,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_X; } @@ -9556,7 +9567,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_X; } @@ -9565,7 +9576,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_XY; } @@ -9575,7 +9586,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_XY; } @@ -9584,7 +9595,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -9594,7 +9605,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_SHORT_XYZW; } @@ -9603,7 +9614,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayered( texture texRef, float x, float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT; } @@ -9613,7 +9624,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayered( float y, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT; } @@ -9622,7 +9633,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_X; } @@ -9632,7 +9643,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_X; } @@ -9641,7 +9652,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_XY; } @@ -9651,7 +9662,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort2 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_XY; } @@ -9660,7 +9671,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLayered(texture float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -9670,7 +9681,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort4 tex2DLayered(texture int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_USHORT_XYZW; } @@ -9679,7 +9690,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayered(texture texRef, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT; } @@ -9689,7 +9700,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayered(texture texRef, int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT; } @@ -9698,7 +9709,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_X; } @@ -9708,7 +9719,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_X; } @@ -9717,7 +9728,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_XY; } @@ -9727,7 +9738,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_XY; } @@ -9736,7 +9747,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayered(texture texRef int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_XYZW; } @@ -9746,7 +9757,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayered(texture texRef int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_INT_XYZW; } @@ -9755,7 +9766,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_X; } @@ -9784,7 +9795,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_X; } @@ -9793,7 +9804,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_XY; } @@ -9803,7 +9814,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_XY; } @@ -9812,7 +9823,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_XYZW; } @@ -9822,7 +9833,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_UINT_XYZW; } @@ -9831,7 +9842,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayered(texture texR float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT; } @@ -9841,7 +9852,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayered(texture texR int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT; } @@ -9850,7 +9861,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_X; } @@ -9860,7 +9871,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_X; } @@ -9869,7 +9880,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_XY; } @@ -9879,7 +9890,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_XY; } @@ -9888,7 +9899,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayered(texture te float y, int layer) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -9898,7 +9909,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayered(texture te int layer) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f)); + __ockl_image_sample_2Da(i, s, float4(x, y, layer, 0.0f).data); TEXTURE_RETURN_FLOAT_XYZW; } @@ -9909,7 +9920,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR; } @@ -9919,7 +9930,7 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR; } @@ -9928,7 +9939,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_X; } @@ -9938,7 +9949,7 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_X; } @@ -9947,7 +9958,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -9957,7 +9968,7 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_XY; } @@ -9966,7 +9977,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -9976,7 +9987,7 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_CHAR_XYZW; } @@ -9985,7 +9996,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredLod( texture texRef, float x, float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR; } @@ -9995,7 +10006,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredLod( float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR; } @@ -10004,7 +10015,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -10014,7 +10025,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_X; } @@ -10023,7 +10034,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -10033,7 +10044,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XY; } @@ -10042,7 +10053,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -10052,7 +10063,7 @@ __TEXTURE_FUNCTIONS_DECL__ uchar4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UCHAR_XYZW; } @@ -10061,7 +10072,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT; } @@ -10071,7 +10082,7 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT; } @@ -10080,7 +10091,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_X; } @@ -10090,7 +10101,7 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_X; } @@ -10099,7 +10110,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -10109,7 +10120,7 @@ __TEXTURE_FUNCTIONS_DECL__ short2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_XY; } @@ -10118,7 +10129,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -10128,7 +10139,7 @@ __TEXTURE_FUNCTIONS_DECL__ short4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_SHORT_XYZW; } @@ -10137,7 +10148,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayeredLod( texture texRef, float x, float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_USHORT; } @@ -10147,7 +10158,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned short tex2DLayeredLod( float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_USHORT; } @@ -10156,7 +10167,7 @@ __TEXTURE_FUNCTIONS_DECL__ ushort1 tex2DLayeredLod(texture texRe int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT; } @@ -10223,7 +10234,7 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayeredLod(texture texRe int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT; } @@ -10232,7 +10243,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_X; } @@ -10242,7 +10253,7 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_X; } @@ -10251,7 +10262,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_XY; } @@ -10261,7 +10272,7 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_XY; } @@ -10270,7 +10281,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredLod(texture tex float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -10280,7 +10291,7 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredLod(texture tex int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_INT_XYZW; } @@ -10289,7 +10300,7 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_X; } @@ -10318,7 +10329,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_X; } @@ -10327,7 +10338,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_XY; } @@ -10337,7 +10348,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_XY; } @@ -10346,7 +10357,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -10356,7 +10367,7 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_UINT_XYZW; } @@ -10365,7 +10376,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredLod(texture t float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT; } @@ -10375,7 +10386,7 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredLod(texture t int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT; } @@ -10384,7 +10395,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -10394,7 +10405,7 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_X; } @@ -10403,7 +10414,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -10413,7 +10424,7 @@ __TEXTURE_FUNCTIONS_DECL__ float2 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XY; } @@ -10422,7 +10433,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_REF_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -10432,7 +10443,7 @@ __TEXTURE_FUNCTIONS_DECL__ float4 tex2DLayeredLod(texture float y, int layer, float level) { TEXTURE_PARAMETERS_INIT; texel.f = __ockl_image_sample_lod_2Da( - i, s, float4(x, y, layer, 0.0f), level); + i, s, float4(x, y, layer, 0.0f).data, level); TEXTURE_RETURN_FLOAT_XYZW; } @@ -10443,9 +10454,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR; } @@ -10455,9 +10466,9 @@ __TEXTURE_FUNCTIONS_DECL__ char tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR; } @@ -10466,9 +10477,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_X; } @@ -10478,9 +10489,9 @@ __TEXTURE_FUNCTIONS_DECL__ char1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_X; } @@ -10489,9 +10500,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XY; } @@ -10501,9 +10512,9 @@ __TEXTURE_FUNCTIONS_DECL__ char2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XY; } @@ -10512,9 +10523,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -10524,9 +10535,9 @@ __TEXTURE_FUNCTIONS_DECL__ char4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_CHAR_XYZW; } @@ -10536,9 +10547,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredGrad( float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR; } @@ -10548,9 +10559,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned char tex2DLayeredGrad( float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UCHAR; } @@ -10559,9 +10570,9 @@ __TEXTURE_FUNCTIONS_DECL__ uchar1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT; } @@ -10640,9 +10651,9 @@ __TEXTURE_FUNCTIONS_DECL__ short tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_SHORT; } @@ -10651,9 +10662,9 @@ __TEXTURE_FUNCTIONS_DECL__ short1 tex2DLayeredGrad(texture texR float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT; } @@ -10825,9 +10836,9 @@ __TEXTURE_FUNCTIONS_DECL__ int tex2DLayeredGrad(texture texR int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT; } @@ -10836,9 +10847,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_X; } @@ -10848,9 +10859,9 @@ __TEXTURE_FUNCTIONS_DECL__ int1 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_X; } @@ -10859,9 +10870,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XY; } @@ -10871,9 +10882,9 @@ __TEXTURE_FUNCTIONS_DECL__ int2 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XY; } @@ -10882,9 +10893,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredGrad(texture te float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XYZW; } @@ -10894,9 +10905,9 @@ __TEXTURE_FUNCTIONS_DECL__ int4 tex2DLayeredGrad(texture te int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_INT_XYZW; } @@ -10906,9 +10917,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredGrad( float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT; } @@ -10918,9 +10929,9 @@ __TEXTURE_FUNCTIONS_DECL__ unsigned int tex2DLayeredGrad( int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT; } @@ -10929,9 +10940,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_X; } @@ -10941,9 +10952,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint1 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_X; } @@ -10952,9 +10963,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XY; } @@ -10964,9 +10975,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint2 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XY; } @@ -10975,9 +10986,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -10987,9 +10998,9 @@ __TEXTURE_FUNCTIONS_DECL__ uint4 tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_UINT_XYZW; } @@ -10998,9 +11009,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_REF_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT; } @@ -11010,9 +11021,9 @@ __TEXTURE_FUNCTIONS_DECL__ float tex2DLayeredGrad(texture float y, int layer, float2 dx, float2 dy) { TEXTURE_PARAMETERS_INIT; texel.f = - __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f), - float2(dx.x, dx.y), - float2(dy.x, dy.y)); + __ockl_image_sample_grad_2Da(i, s, float4(x, y, layer, 0.0f).data, + float2(dx.x, dx.y).data, + float2(dy.x, dy.y).data); TEXTURE_RETURN_FLOAT; } @@ -11021,9 +11032,9 @@ __TEXTURE_FUNCTIONS_DECL__ float1 tex2DLayeredGrad(texture Date: Mon, 30 Jul 2018 20:41:24 +0000 Subject: [PATCH 25/29] Protect macro TYPEDEF_VECTOR_VALUE_TYPE and prefix __hip_ for vector_value_types [ROCm/hip commit: 99e64968985a763e1f716f1737c50bc11d0f43a0] --- .../hip/hcc_detail/texture_functions.h | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/projects/hip/include/hip/hcc_detail/texture_functions.h b/projects/hip/include/hip/hcc_detail/texture_functions.h index 892b39780a..2a7aeb7357 100644 --- a/projects/hip/include/hip/hcc_detail/texture_functions.h +++ b/projects/hip/include/hip/hcc_detail/texture_functions.h @@ -26,21 +26,25 @@ THE SOFTWARE. #include #include +#pragma push_macro("TYPEDEF_VECTOR_VALUE_TYPE") #define TYPEDEF_VECTOR_VALUE_TYPE(SCALAR_TYPE) \ -typedef SCALAR_TYPE SCALAR_TYPE##2_vector_value_type __attribute__((ext_vector_type(2))); \ -typedef SCALAR_TYPE SCALAR_TYPE##3_vector_value_type __attribute__((ext_vector_type(3))); \ -typedef SCALAR_TYPE SCALAR_TYPE##4_vector_value_type __attribute__((ext_vector_type(4))); \ -typedef SCALAR_TYPE SCALAR_TYPE##8_vector_value_type __attribute__((ext_vector_type(8))); \ -typedef SCALAR_TYPE SCALAR_TYPE##16_vector_value_type __attribute__((ext_vector_type(16))); +typedef SCALAR_TYPE __hip_##SCALAR_TYPE##2_vector_value_type __attribute__((ext_vector_type(2))); \ +typedef SCALAR_TYPE __hip_##SCALAR_TYPE##3_vector_value_type __attribute__((ext_vector_type(3))); \ +typedef SCALAR_TYPE __hip_##SCALAR_TYPE##4_vector_value_type __attribute__((ext_vector_type(4))); \ +typedef SCALAR_TYPE __hip_##SCALAR_TYPE##8_vector_value_type __attribute__((ext_vector_type(8))); \ +typedef SCALAR_TYPE __hip_##SCALAR_TYPE##16_vector_value_type __attribute__((ext_vector_type(16))); TYPEDEF_VECTOR_VALUE_TYPE(float); TYPEDEF_VECTOR_VALUE_TYPE(int); TYPEDEF_VECTOR_VALUE_TYPE(uint); +#undef TYPEDEF_VECTOR_VALUE_TYPE +#pragma pop_macro("TYPEDEF_VECTOR_VALUE_TYPE") + union TData { - float4_vector_value_type f; - int4_vector_value_type i; - uint4_vector_value_type u; + __hip_float4_vector_value_type f; + __hip_int4_vector_value_type i; + __hip_uint4_vector_value_type u; }; #define __TEXTURE_FUNCTIONS_DECL__ static __inline__ __device__ @@ -165,110 +169,110 @@ union TData { extern "C" { __device__ -float4_vector_value_type __ockl_image_sample_1D( +__hip_float4_vector_value_type __ockl_image_sample_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c); __device__ -float4_vector_value_type __ockl_image_sample_1Da( +__hip_float4_vector_value_type __ockl_image_sample_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c); + __hip_float2_vector_value_type c); __device__ -float4_vector_value_type __ockl_image_sample_2D( +__hip_float4_vector_value_type __ockl_image_sample_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c); + __hip_float2_vector_value_type c); __device__ -float4_vector_value_type __ockl_image_sample_2Da( +__hip_float4_vector_value_type __ockl_image_sample_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c); + __hip_float4_vector_value_type c); __device__ float __ockl_image_sample_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c); + __hip_float4_vector_value_type c); __device__ float __ockl_image_sample_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c); + __hip_float2_vector_value_type c); __device__ -float4_vector_value_type __ockl_image_sample_3D( +__hip_float4_vector_value_type __ockl_image_sample_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c); + __hip_float4_vector_value_type c); __device__ -float4_vector_value_type __ockl_image_sample_grad_1D( +__hip_float4_vector_value_type __ockl_image_sample_grad_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float dx, float dy); __device__ -float4_vector_value_type __ockl_image_sample_grad_1Da( +__hip_float4_vector_value_type __ockl_image_sample_grad_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float dx, float dy); + __hip_float2_vector_value_type c, float dx, float dy); __device__ -float4_vector_value_type __ockl_image_sample_grad_2D( +__hip_float4_vector_value_type __ockl_image_sample_grad_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); + __hip_float2_vector_value_type c, __hip_float2_vector_value_type dx, __hip_float2_vector_value_type dy); __device__ -float4_vector_value_type __ockl_image_sample_grad_2Da( +__hip_float4_vector_value_type __ockl_image_sample_grad_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); + __hip_float4_vector_value_type c, __hip_float2_vector_value_type dx, __hip_float2_vector_value_type dy); __device__ float __ockl_image_sample_grad_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); + __hip_float4_vector_value_type c, __hip_float2_vector_value_type dx, __hip_float2_vector_value_type dy); __device__ float __ockl_image_sample_grad_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float2_vector_value_type dx, float2_vector_value_type dy); + __hip_float2_vector_value_type c, __hip_float2_vector_value_type dx, __hip_float2_vector_value_type dy); __device__ -float4_vector_value_type __ockl_image_sample_grad_3D( +__hip_float4_vector_value_type __ockl_image_sample_grad_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float4_vector_value_type dx, float4_vector_value_type dy); + __hip_float4_vector_value_type c, __hip_float4_vector_value_type dx, __hip_float4_vector_value_type dy); __device__ -float4_vector_value_type __ockl_image_sample_lod_1D( +__hip_float4_vector_value_type __ockl_image_sample_lod_1D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, float c, float l); __device__ -float4_vector_value_type __ockl_image_sample_lod_1Da( +__hip_float4_vector_value_type __ockl_image_sample_lod_1Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float l); + __hip_float2_vector_value_type c, float l); __device__ -float4_vector_value_type __ockl_image_sample_lod_2D( +__hip_float4_vector_value_type __ockl_image_sample_lod_2D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float l); + __hip_float2_vector_value_type c, float l); __device__ -float4_vector_value_type __ockl_image_sample_lod_2Da( +__hip_float4_vector_value_type __ockl_image_sample_lod_2Da( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float l); + __hip_float4_vector_value_type c, float l); __device__ float __ockl_image_sample_lod_2Dad( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float l); + __hip_float4_vector_value_type c, float l); __device__ float __ockl_image_sample_lod_2Dd( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float2_vector_value_type c, float l); + __hip_float2_vector_value_type c, float l); __device__ -float4_vector_value_type __ockl_image_sample_lod_3D( +__hip_float4_vector_value_type __ockl_image_sample_lod_3D( unsigned int ADDRESS_SPACE_CONSTANT* i, unsigned int ADDRESS_SPACE_CONSTANT* s, - float4_vector_value_type c, float l); + __hip_float4_vector_value_type c, float l); } //////////////////////////////////////////////////////////// From 2122770861009177c04084277ec36d3f1a3901c0 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Tue, 31 Jul 2018 22:25:48 +0300 Subject: [PATCH 26/29] [HIPIFY][FFT] Add cuFFT support + Add API_FFT support (data types and functions) + Add CUFFT_API_supported_by_HIP.md + Add simple_cufft.cu test + Update README.md [ROCm/hip commit: 70cfa5e53cf4c146c9d8ef6bbc13c531ed0a0bee] --- .../markdown/CUFFT_API_supported_by_HIP.md | 81 +++++++++++++++++ projects/hip/hipify-clang/README.md | 62 +++++++------ projects/hip/hipify-clang/src/CUDA2HipMap.cpp | 90 ++++++++++++++++++- .../hip/hipify-clang/src/HipifyAction.cpp | 4 + projects/hip/hipify-clang/src/HipifyAction.h | 1 + projects/hip/hipify-clang/src/Statistics.cpp | 2 +- projects/hip/hipify-clang/src/Statistics.h | 1 + .../tests/hipify-clang/cuFFT/simple_cufft.cu | 78 ++++++++++++++++ .../hip/tests/hipify-clang/headers_test_09.cu | 4 + 9 files changed, 293 insertions(+), 30 deletions(-) create mode 100644 projects/hip/docs/markdown/CUFFT_API_supported_by_HIP.md create mode 100644 projects/hip/tests/hipify-clang/cuFFT/simple_cufft.cu diff --git a/projects/hip/docs/markdown/CUFFT_API_supported_by_HIP.md b/projects/hip/docs/markdown/CUFFT_API_supported_by_HIP.md new file mode 100644 index 0000000000..57a9d414b7 --- /dev/null +++ b/projects/hip/docs/markdown/CUFFT_API_supported_by_HIP.md @@ -0,0 +1,81 @@ +# CUFFT API supported by HIP + +## **1. CUFFT Data types** + +| **type** | **CUDA** | **HIP** |**HIP value** (if differs) | +|-------------:|---------------------------------------------------------------|------------------------------------------------------------|---------------------------| +| enum |***`cufftResult_t`*** |***`hipfftResult_t`*** | +| enum |***`cufftResult`*** |***`hipfftResult`*** | +| 0x0 |*`CUFFT_SUCCESS`* |*`HIPFFT_SUCCESS`* | 0 | +| 0x1 |*`CUFFT_INVALID_PLAN`* |*`HIPFFT_INVALID_PLAN`* | 1 | +| 0x2 |*`CUFFT_ALLOC_FAILED`* |*`HIPFFT_ALLOC_FAILED`* | 2 | +| 0x3 |*`CUFFT_INVALID_TYPE`* |*`HIPFFT_INVALID_TYPE`* | 3 | +| 0x4 |*`CUFFT_INVALID_VALUE`* |*`HIPFFT_INVALID_VALUE`* | 4 | +| 0x5 |*`CUFFT_INTERNAL_ERROR`* |*`HIPFFT_INTERNAL_ERROR`* | 5 | +| 0x6 |*`CUFFT_EXEC_FAILED`* |*`HIPFFT_EXEC_FAILED`* | 6 | +| 0x7 |*`CUFFT_SETUP_FAILED`* |*`HIPFFT_SETUP_FAILED`* | 7 | +| 0x8 |*`CUFFT_I;NVALID_SIZE`* |*`HIPFFT_INVALID_SIZE`* | 8 | +| 0x9 |*`CUFFT_UNALIGNED_DATA`* |*`HIPFFT_UNALIGNED_DATA`* | 9 | +| 0xA |*`CUFFT_INCOMPLETE_PARAMETER_LIST`* |*`HIPFFT_INCOMPLETE_PARAMETER_LIST`* | 10 | +| 0xB |*`CUFFT_INVALID_DEVICE`* |*`HIPFFT_INVALID_DEVICE`* | 11 | +| 0xC |*`CUFFT_PARSE_ERROR`* |*`HIPFFT_PARSE_ERROR`* | 12 | +| 0xD |*`CUFFT_NO_WORKSPACE`* |*`HIPFFT_NO_WORKSPACE`* | 13 | +| 0xE |*`CUFFT_NOT_IMPLEMENTED`* |*`HIPFFT_NOT_IMPLEMENTED`* | 14 | +| 0xF |*`CUFFT_LICENSE_ERROR`* | | +| 0x10 |*`CUFFT_NOT_SUPPORTED`* |*`HIPFFT_NOT_SUPPORTED`* | 16 | +| float |***`cufftReal`*** |***`hipfftReal`*** | +| double |***`cufftDoubleReal`*** |***`hipfftDoubleReal`*** | +| float2 |***`cufftComplex`*** |***`hipfftComplex`*** | +| double2 |***`cufftDoubleComplex`*** |***`hipfftDoubleComplex`*** | +| define |`CUFFT_FORWARD` |`HIPFFT_FORWARD` | +| define |`CUFFT_INVERSE` |`HIPFFT_BACKWARD` | +| enum |***`cufftType_t`*** |***`hipfftType_t`*** | +| enum |***`cufftType`*** |***`hipfftType`*** | +| 0x2a |*`CUFFT_R2C`* |*`HIPFFT_R2C`* | +| 0x2c |*`CUFFT_C2R`* |*`HIPFFT_C2R`* | +| 0x29 |*`CUFFT_C2C`* |*`HIPFFT_C2C`* | +| 0x6a |*`CUFFT_D2Z`* |*`HIPFFT_D2Z`* | +| 0x6c |*`CUFFT_Z2D`* |*`HIPFFT_Z2D`* | +| 0x69 |*`CUFFT_Z2Z`* |*`HIPFFT_Z2Z`* | +| enum |***`cufftCompatibility_t`*** | | +| enum |***`cufftCompatibility`*** | | +| 0x01 |*`CUFFT_COMPATIBILITY_FFTW_PADDING`* | | +| define |`CUFFT_COMPATIBILITY_DEFAULT` | | +| int |***`cufftHandle`*** |***`hipfftHandle`*** | + +## **2. CUFFT API functions** + +| **CUDA** | **HIP** | +|-----------------------------------------------------------|-------------------------------------------------| +|`cufftPlan1d` |`hipfftPlan1d` | +|`cufftPlan2d` |`hipfftPlan2d` | +|`cufftPlan3d` |`hipfftPlan3d` | +|`cufftPlanMany` |`hipfftPlanMany` | +|`cufftMakePlan1d` |`hipfftMakePlan1d` | +|`cufftMakePlan2d` |`hipfftMakePlan2d` | +|`cufftMakePlan3d` |`hipfftMakePlan3d` | +|`cufftMakePlanMany` |`hipfftMakePlanMany` | +|`cufftMakePlanMany64` |`hipfftMakePlanMany64` | +|`cufftGetSizeMany64` |`hipfftGetSizeMany64` | +|`cufftEstimate1d` |`hipfftEstimate1d` | +|`cufftEstimate2d` |`hipfftEstimate2d` | +|`cufftEstimate3d` |`hipfftEstimate3d` | +|`cufftEstimateMany` |`hipfftEstimateMany` | +|`cufftCreate` |`hipfftCreate` | +|`cufftGetSize1d` |`hipfftGetSize1d` | +|`cufftGetSize2d` |`hipfftGetSize2d` | +|`cufftGetSize3d` |`hipfftGetSize3d` | +|`cufftGetSizeMany` |`hipfftGetSizeMany` | +|`cufftGetSize` |`hipfftGetSize` | +|`cufftSetWorkArea` |`hipfftSetWorkArea` | +|`cufftSetAutoAllocation` |`hipfftSetAutoAllocation` | +|`cufftExecC2C` |`hipfftExecC2C` | +|`cufftExecR2C` |`hipfftExecR2C` | +|`cufftExecC2R` |`hipfftExecC2R` | +|`cufftExecZ2Z` |`hipfftExecZ2Z` | +|`cufftExecD2Z` |`hipfftExecD2Z` | +|`cufftExecZ2D` |`hipfftExecZ2D` | +|`cufftSetStream` |`hipfftSetStream` | +|`cufftDestroy` |`hipfftDestroy` | +|`cufftGetVersion` |`hipfftGetVersion` | +|`cufftGetProperty` | | diff --git a/projects/hip/hipify-clang/README.md b/projects/hip/hipify-clang/README.md index e099085ca6..fdb37d2e2d 100644 --- a/projects/hip/hipify-clang/README.md +++ b/projects/hip/hipify-clang/README.md @@ -6,19 +6,30 @@ -- [Using hipify-clang](#using-hipify-clang) - * [Build and install](#build-and-install) - * [Running and using hipify-clang](#running-and-using-hipify-clang) +- [Supported CUDA APIs](#cuda-apis) +- [Dependencies](#dependencies) +- [Build and install](#build-and-install) + * [Building](#building) + * [Testing](#testing) + * [Windows](#windows) +- [Running and using hipify-clang](#running-and-using-hipify-clang) - [Disclaimer](#disclaimer) -## Build and install +##Supported CUDA APIs -### Dependencies +- [Runtime API](../docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md) +- [Driver API](../docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md) +- [cuBLAS](../docs/markdown/CUBLAS_API_supported_by_HIP.md) +- [cuRAND](../docs/markdown/CURAND_API_supported_by_HIP.md) +- [cuDNN](../docs/markdown/CUDNN_API_supported_by_HIP.md) +- [cuFFT](../docs/markdown/CUFFT_API_supported_by_HIP.md) + +##Dependencies `hipify-clang` requires: -1. LLVM+CLANG of at least version 3.8.0, latest stable release is 6.0.0. +1. LLVM+CLANG of at least version 3.8.0, latest stable and recommended release is 6.0.1. 2. CUDA at least version 7.5, latest supported release is 9.0. | **LLVM release version** | **CUDA latest supported version** | @@ -38,10 +49,11 @@ In most cases, you can get a suitable version of LLVM+CLANG with your package manager. Failing that or having multiple versions of LLVM, you can [download a release archive](http://releases.llvm.org/), build or install it, and set -[CMAKE_PREFIX_PATH](https://cmake.org/cmake/help/v3.0/variable/CMAKE_PREFIX_PATH.html) so `cmake` can find it; for instance: `-DCMAKE_PREFIX_PATH=f:\LLVM\6.0.0\dist` +[CMAKE_PREFIX_PATH](https://cmake.org/cmake/help/v3.10/variable/CMAKE_PREFIX_PATH.html) so `cmake` can find it; for instance: `-DCMAKE_PREFIX_PATH=f:\LLVM\6.0.1\dist` -### Build +##Build and install +###Build Assuming this repository is at `./HIP`: @@ -64,14 +76,14 @@ Debug build type `-DCMAKE_BUILD_TYPE=Debug` is also supported and tested, `LLVM+ The binary can then be found at `./dist/bin/hipify-clang`. -### Test +###Test `hipify-clang` has unit tests using LLVM [`lit`](https://llvm.org/docs/CommandGuide/lit.html)/[`FileCheck`](https://llvm.org/docs/CommandGuide/FileCheck.html). **LLVM+CLANG should be built from sources, Pre-Built Binaries are not exhaustive for testing.** To run it: -1. Download [`LLVM`](http://releases.llvm.org/6.0.0/llvm-6.0.0.src.tar.xz)+[`CLANG`](http://releases.llvm.org/6.0.0/cfe-6.0.0.src.tar.xz) sources. +1. Download [`LLVM`](http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz)+[`CLANG`](http://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz) sources. 2. Build [`LLVM+CLANG`](http://llvm.org/docs/CMake.html). For instance: ```shell @@ -110,21 +122,21 @@ To run it: 6. Ensure `lit` and `FileCheck` are installed - these are distributed with LLVM. * installing `lit` into `python` might be required: - `python f:/LLVM/6.0.0/llvm/utils/lit/setup.py install`, + `python f:/LLVM/6.0.1/llvm/utils/lit/setup.py install`, - where `f:/LLVM/6.0.0/llvm` is LLVM sources root directory. + where `f:/LLVM/6.0.1/llvm` is LLVM sources root directory. - * Starting with LLVM 6.0.0 path to llvm-lit.py script should be specified by the `LLVM_EXTERNAL_LIT` option: + * Starting with LLVM 6.0.1 path to llvm-lit.py script should be specified by the `LLVM_EXTERNAL_LIT` option: - `-DLLVM_EXTERNAL_LIT=f:/LLVM/6.0.0/build/Release/bin/llvm-lit.py`, + `-DLLVM_EXTERNAL_LIT=f:/LLVM/6.0.1/build/Release/bin/llvm-lit.py`, - where `f:/LLVM/6.0.0/build/Release` is LLVM build directory. + where `f:/LLVM/6.0.1/build/Release` is LLVM build directory. 7. Build with the `HIPIFY_CLANG_TESTS` option turned on: -DHIPIFY_CLANG_TESTS=1. 8. `make test-hipify` On Windows after `cmake` the project `test-hipify` in the generated `hipify-clang.sln` should be built by `Visual Studio 15 2017` instead of `make test-hipify`. -### Windows +###Windows On Windows the following configurations are tested: @@ -144,30 +156,30 @@ cmake -DHIPIFY_CLANG_TESTS=1 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=../dist \ - -DCMAKE_PREFIX_PATH=f:/LLVM/6.0.0/dist \ + -DCMAKE_PREFIX_PATH=f:/LLVM/6.0.1/dist \ -DCUDA_TOOLKIT_ROOT_DIR="c:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.0" \ -DCUDA_SDK_ROOT_DIR="c:/ProgramData/NVIDIA Corporation/CUDA Samples/v9.0" \ -DCUDA_DNN_ROOT_DIR=f:/CUDNN/cudnn-9.0-windows10-x64-v7.1 \ - -DLLVM_EXTERNAL_LIT=f:/LLVM/6.0.0/build/Release/bin/llvm-lit.py \ + -DLLVM_EXTERNAL_LIT=f:/LLVM/6.0.1/build/Release/bin/llvm-lit.py \ -Thost=x64 .. ``` A corresponding successful output: ```shell --- Found LLVM 6.0.0: --- - CMake module path: F:/LLVM/6.0.0/dist/lib/cmake/llvm --- - Include path : F:/LLVM/6.0.0/dist/include --- - Binary path : F:/LLVM/6.0.0/dist/bin +-- Found LLVM 6.0.1: +-- - CMake module path: F:/LLVM/6.0.1/dist/lib/cmake/llvm +-- - Include path : F:/LLVM/6.0.1/dist/include +-- - Binary path : F:/LLVM/6.0.1/dist/bin -- Found PythonInterp: C:/Program Files/Python36/python.exe (found suitable version "3.6.4", minimum required is "2.7") -- Found lit: C:/Program Files/Python36/Scripts/lit.exe --- Found FileCheck: F:/LLVM/6.0.0/dist/bin/FileCheck.exe +-- Found FileCheck: F:/LLVM/6.0.1/dist/bin/FileCheck.exe -- Found CUDA: C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.0 (found version "9.0") -- Configuring done -- Generating done -- Build files have been written to: f:/HIP/hipify-clang/build ``` -## Running and using hipify-clang +##Running and using hipify-clang To process a file, `hipify-clang` needs access to the same headers that would be needed to compile it with clang. @@ -188,7 +200,7 @@ may be useful. For a list of `hipify-clang` options, run `hipify-clang --help`. -## Disclaimer +##Disclaimer The information contained herein is for informational purposes only, and is subject to change without notice. While every precaution has been taken in the preparation of this document, it may contain technical inaccuracies, omissions and typographical errors, and AMD is under no obligation to update or otherwise correct this information. Advanced Micro Devices, Inc. makes no representations or warranties with respect to the accuracy or completeness of the contents of this document, and assumes no liability of any kind, including the implied warranties of noninfringement, merchantability or fitness for particular purposes, with respect to the operation or use of AMD hardware, software or other products described herein. No license, including implied or arising by estoppel, to any intellectual property rights is granted by this document. Terms and limitations applicable to the purchase or use of AMD's products are as set forth in a signed agreement between the parties or in AMD's Standard Terms and Conditions of Sale. diff --git a/projects/hip/hipify-clang/src/CUDA2HipMap.cpp b/projects/hip/hipify-clang/src/CUDA2HipMap.cpp index 63c294ac34..ca53738abb 100644 --- a/projects/hip/hipify-clang/src/CUDA2HipMap.cpp +++ b/projects/hip/hipify-clang/src/CUDA2HipMap.cpp @@ -395,7 +395,10 @@ const std::map CUDA_INCLUDE_MAP{ {"curand_uniform.h", {"hiprand_kernel.h", CONV_INCLUDE, API_RAND}}, // CUDNN includes - {"cudnn.h", {"hipDNN.h", CONV_INCLUDE_CUDA_MAIN_H, API_RAND}}, + {"cudnn.h", {"hipDNN.h", CONV_INCLUDE_CUDA_MAIN_H, API_DNN}}, + + // CUDNN includes + {"cufft.h", {"hipfft.h", CONV_INCLUDE_CUDA_MAIN_H, API_FFT}}, // HIP includes // TODO: uncomment this when hip/cudacommon.h will be renamed to hip/hipcommon.h @@ -3161,7 +3164,7 @@ const std::map CUDA_IDENTIFIER_MAP{ {"cudnnDebug_t", {"hipdnnDebug_t", CONV_TYPE, API_DNN, HIP_UNSUPPORTED}}, {"cudnnCallback_t", {"hipdnnCallback_t", CONV_TYPE, API_DNN, HIP_UNSUPPORTED}}, - ///////////////////////////// cuDNN functions ///////////////////////////// + ///////////////////////////// cuDNN functions ///////////////////////////// {"cudnnGetVersion", {"hipdnnGetVersion", CONV_VERSION, API_DNN}}, {"cudnnGetCudartVersion", {"hipdnnGetCudartVersion", CONV_VERSION, API_DNN, HIP_UNSUPPORTED}}, {"cudnnQueryRuntimeError", {"hipdnnQueryRuntimeError", CONV_VERSION, API_DNN, HIP_UNSUPPORTED}}, @@ -3193,7 +3196,7 @@ const std::map CUDA_IDENTIFIER_MAP{ {"cudnnDestroyOpTensorDescriptor", {"hipdnnDestroyOpTensorDescriptor", CONV_MATH_FUNC, API_DNN}}, {"cudnnOpTensor", {"hipdnnOpTensor", CONV_MATH_FUNC, API_DNN}}, - // cuDNN Reduce Tensor functions + // cuDNN Reduce Tensor functions {"cudnnCreateReduceTensorDescriptor", {"hipdnnCreateReduceTensorDescriptor", CONV_MATH_FUNC, API_DNN}}, {"cudnnSetReduceTensorDescriptor", {"hipdnnSetReduceTensorDescriptor", CONV_MATH_FUNC, API_DNN}}, {"cudnnGetReduceTensorDescriptor", {"hipdnnGetReduceTensorDescriptor", CONV_MATH_FUNC, API_DNN}}, @@ -3206,7 +3209,7 @@ const std::map CUDA_IDENTIFIER_MAP{ // cuDNN Filter functions {"cudnnCreateFilterDescriptor", {"hipdnnCreateFilterDescriptor", CONV_MATH_FUNC, API_DNN}}, - {"cudnnSetFilter4dDescriptor", {"hipdnnSetFilter4dDescriptor", CONV_MATH_FUNC, API_DNN, HIP_UNSUPPORTED}}, + {"cudnnSetFilter4dDescriptor", {"hipdnnSetFilter4dDescriptor", CONV_MATH_FUNC, API_DNN}}, {"cudnnGetFilter4dDescriptor", {"hipdnnGetFilter4dDescriptor", CONV_MATH_FUNC, API_DNN, HIP_UNSUPPORTED}}, {"cudnnSetFilterNdDescriptor", {"hipdnnSetFilterNdDescriptor", CONV_MATH_FUNC, API_DNN}}, {"cudnnGetFilterNdDescriptor", {"hipdnnGetFilterNdDescriptor", CONV_MATH_FUNC, API_DNN}}, @@ -3365,6 +3368,85 @@ const std::map CUDA_IDENTIFIER_MAP{ {"cudnnGetAlgorithmSpaceSize", {"hipdnnGetAlgorithmSpaceSize", CONV_MATH_FUNC, API_DNN, HIP_UNSUPPORTED}}, {"cudnnSaveAlgorithm", {"hipdnnSaveAlgorithm", CONV_MATH_FUNC, API_DNN, HIP_UNSUPPORTED}}, {"cudnnRestoreAlgorithm", {"hipdnnRestoreAlgorithm", CONV_MATH_FUNC, API_DNN, HIP_UNSUPPORTED}}, + + ///////////////////////////// cuFFT ///////////////////////////// + // cuFFT defines + {"CUFFT_FORWARD", {"HIPFFT_FORWARD", CONV_NUMERIC_LITERAL, API_DNN}}, // -1 + {"CUFFT_INVERSE", {"HIPFFT_BACKWARD", CONV_NUMERIC_LITERAL, API_DNN}}, // 1 + {"CUFFT_COMPATIBILITY_DEFAULT", {"HIPFFT_COMPATIBILITY_DEFAULT", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}}, // CUFFT_COMPATIBILITY_FFTW_PADDING + + // cuFFT enums + {"cufftResult_t", {"hipfftResult_t", CONV_TYPE, API_FFT}}, + {"cufftResult", {"hipfftResult", CONV_TYPE, API_FFT}}, + {"CUFFT_SUCCESS", {"HIPFFT_SUCCESS", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x0 0 + {"CUFFT_INVALID_PLAN", {"HIPFFT_INVALID_PLAN", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x1 1 + {"CUFFT_ALLOC_FAILED", {"HIPFFT_ALLOC_FAILED", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x2 2 + {"CUFFT_INVALID_TYPE", {"HIPFFT_INVALID_TYPE", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x3 3 + {"CUFFT_INVALID_VALUE", {"HIPFFT_INVALID_VALUE", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x4 4 + {"CUFFT_INTERNAL_ERROR", {"HIPFFT_INTERNAL_ERROR", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x5 5 + {"CUFFT_EXEC_FAILED", {"HIPFFT_EXEC_FAILED", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x6 6 + {"CUFFT_SETUP_FAILED", {"HIPFFT_SETUP_FAILED", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x7 7 + {"CUFFT_INVALID_SIZE", {"HIPFFT_INVALID_SIZE", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x8 8 + {"CUFFT_UNALIGNED_DATA", {"HIPFFT_UNALIGNED_DATA", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x9 9 + {"CUFFT_INCOMPLETE_PARAMETER_LIST", {"HIPFFT_INCOMPLETE_PARAMETER_LIST", CONV_NUMERIC_LITERAL, API_FFT}}, // 0xA 10 + {"CUFFT_INVALID_DEVICE", {"HIPFFT_INVALID_DEVICE", CONV_NUMERIC_LITERAL, API_FFT}}, // 0xB 11 + {"CUFFT_PARSE_ERROR", {"HIPFFT_PARSE_ERROR", CONV_NUMERIC_LITERAL, API_FFT}}, // 0xC 12 + {"CUFFT_NO_WORKSPACE", {"HIPFFT_NO_WORKSPACE", CONV_NUMERIC_LITERAL, API_FFT}}, // 0xD 13 + {"CUFFT_NOT_IMPLEMENTED", {"HIPFFT_NOT_IMPLEMENTED", CONV_NUMERIC_LITERAL, API_FFT}}, // 0xE 14 + {"CUFFT_LICENSE_ERROR", {"HIPFFT_LICENSE_ERROR", CONV_NUMERIC_LITERAL, API_FFT, HIP_UNSUPPORTED}}, + {"CUFFT_NOT_SUPPORTED", {"HIPFFT_NOT_SUPPORTED", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x10 16 + {"cufftType_t", {"hipfftType_t", CONV_TYPE, API_FFT}}, + {"cufftType", {"hipfftType", CONV_TYPE, API_FFT}}, + {"CUFFT_R2C", {"HIPFFT_R2C", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x2a + {"CUFFT_C2R", {"HIPFFT_C2R", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x2c + {"CUFFT_C2C", {"HIPFFT_C2C", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x29 + {"CUFFT_D2Z", {"HIPFFT_D2Z", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x6a + {"CUFFT_Z2D", {"HIPFFT_Z2D", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x6c + {"CUFFT_Z2Z", {"HIPFFT_Z2Z", CONV_NUMERIC_LITERAL, API_FFT}}, // 0x69 + {"cufftCompatibility_t", {"hipfftCompatibility_t", CONV_TYPE, API_FFT, HIP_UNSUPPORTED}}, + {"cufftCompatibility", {"hipfftCompatibility", CONV_TYPE, API_FFT, HIP_UNSUPPORTED}}, + {"CUFFT_COMPATIBILITY_FFTW_PADDING", {"HIPFFT_COMPATIBILITY_FFTW_PADDING", CONV_NUMERIC_LITERAL, API_FFT, HIP_UNSUPPORTED}}, // 0x01 + + // cuFFT types + {"cufftReal", {"hipfftReal", CONV_TYPE, API_FFT}}, + {"cufftDoubleReal", {"hipfftDoubleReal", CONV_TYPE, API_FFT}}, + {"cufftComplex", {"hipfftComplex", CONV_TYPE, API_FFT}}, + {"cufftDoubleComplex", {"hipfftDoubleComplex", CONV_TYPE, API_FFT}}, + {"cufftHandle", {"hipfftHandle", CONV_TYPE, API_FFT}}, + + ///////////////////////////// cuFFT functions ///////////////////////////// + {"cufftPlan1d", {"hipfftPlan1d", CONV_MATH_FUNC, API_FFT}}, + {"cufftPlan2d", {"hipfftPlan2d", CONV_MATH_FUNC, API_FFT}}, + {"cufftPlan3d", {"hipfftPlan3d", CONV_MATH_FUNC, API_FFT}}, + {"cufftPlanMany", {"hipfftPlanMany", CONV_MATH_FUNC, API_FFT}}, + {"cufftMakePlan1d", {"hipfftMakePlan1d", CONV_MATH_FUNC, API_FFT}}, + {"cufftMakePlan2d", {"hipfftMakePlan2d", CONV_MATH_FUNC, API_FFT}}, + {"cufftMakePlan3d", {"hipfftMakePlan3d", CONV_MATH_FUNC, API_FFT}}, + {"cufftMakePlanMany", {"hipfftMakePlanMany", CONV_MATH_FUNC, API_FFT}}, + {"cufftMakePlanMany64", {"hipfftMakePlanMany64", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSizeMany64", {"hipfftGetSizeMany64", CONV_MATH_FUNC, API_FFT}}, + {"cufftEstimate1d", {"hipfftEstimate1d", CONV_MATH_FUNC, API_FFT}}, + {"cufftEstimate2d", {"hipfftEstimate2d", CONV_MATH_FUNC, API_FFT}}, + {"cufftEstimate3d", {"hipfftEstimate3d", CONV_MATH_FUNC, API_FFT}}, + {"cufftEstimateMany", {"hipfftEstimateMany", CONV_MATH_FUNC, API_FFT}}, + {"cufftCreate", {"hipfftCreate", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSize1d", {"hipfftGetSize1d", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSize2d", {"hipfftGetSize2d", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSize3d", {"hipfftGetSize3d", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSizeMany", {"hipfftGetSizeMany", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetSize", {"hipfftGetSize", CONV_MATH_FUNC, API_FFT}}, + {"cufftSetWorkArea", {"hipfftSetWorkArea", CONV_MATH_FUNC, API_FFT}}, + {"cufftSetAutoAllocation", {"hipfftSetAutoAllocation", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecC2C", {"hipfftExecC2C", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecR2C", {"hipfftExecR2C", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecC2R", {"hipfftExecC2R", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecZ2Z", {"hipfftExecZ2Z", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecD2Z", {"hipfftExecD2Z", CONV_MATH_FUNC, API_FFT}}, + {"cufftExecZ2D", {"hipfftExecZ2D", CONV_MATH_FUNC, API_FFT}}, + {"cufftSetStream", {"hipfftSetStream", CONV_MATH_FUNC, API_FFT}}, + {"cufftDestroy", {"hipfftDestroy", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetVersion", {"hipfftGetVersion", CONV_MATH_FUNC, API_FFT}}, + {"cufftGetProperty", {"hipfftGetProperty", CONV_MATH_FUNC, API_FFT, HIP_UNSUPPORTED}}, }; const std::map& CUDA_RENAMES_MAP() { diff --git a/projects/hip/hipify-clang/src/HipifyAction.cpp b/projects/hip/hipify-clang/src/HipifyAction.cpp index 21b16e0699..20bc9dcc2c 100644 --- a/projects/hip/hipify-clang/src/HipifyAction.cpp +++ b/projects/hip/hipify-clang/src/HipifyAction.cpp @@ -164,6 +164,10 @@ bool HipifyAction::Exclude(const hipCounter & hipToken) { if (insertedDNNHeader) { return true; } insertedDNNHeader = true; return false; + case API_FFT: + if (insertedFFTHeader) { return true; } + insertedFFTHeader = true; + return false; default: return false; } diff --git a/projects/hip/hipify-clang/src/HipifyAction.h b/projects/hip/hipify-clang/src/HipifyAction.h index af75f93063..ad987c921e 100644 --- a/projects/hip/hipify-clang/src/HipifyAction.h +++ b/projects/hip/hipify-clang/src/HipifyAction.h @@ -28,6 +28,7 @@ private: bool insertedRANDHeader = false; bool insertedRAND_kernelHeader = false; bool insertedDNNHeader = false; + bool insertedFFTHeader = false; bool firstHeader = false; bool pragmaOnce = false; clang::SourceLocation firstHeaderLoc; diff --git a/projects/hip/hipify-clang/src/Statistics.cpp b/projects/hip/hipify-clang/src/Statistics.cpp index 13d4c3effc..595f243857 100644 --- a/projects/hip/hipify-clang/src/Statistics.cpp +++ b/projects/hip/hipify-clang/src/Statistics.cpp @@ -14,7 +14,7 @@ const char *counterNames[NUM_CONV_TYPES] = { }; const char *apiNames[NUM_API_TYPES] = { - "CUDA Driver API", "CUDA RT API", "CUBLAS API", "CURAND API", "CUDNN API" + "CUDA Driver API", "CUDA RT API", "CUBLAS API", "CURAND API", "CUDNN API", "CUFFT API" }; namespace { diff --git a/projects/hip/hipify-clang/src/Statistics.h b/projects/hip/hipify-clang/src/Statistics.h index 77bf9b0518..00ecce3eda 100644 --- a/projects/hip/hipify-clang/src/Statistics.h +++ b/projects/hip/hipify-clang/src/Statistics.h @@ -57,6 +57,7 @@ enum ApiTypes { API_BLAS, API_RAND, API_DNN, + API_FFT, API_LAST }; constexpr int NUM_API_TYPES = (int) ApiTypes::API_LAST; diff --git a/projects/hip/tests/hipify-clang/cuFFT/simple_cufft.cu b/projects/hip/tests/hipify-clang/cuFFT/simple_cufft.cu new file mode 100644 index 0000000000..906fe93853 --- /dev/null +++ b/projects/hip/tests/hipify-clang/cuFFT/simple_cufft.cu @@ -0,0 +1,78 @@ +// RUN: %run_test hipify "%s" "%t" %cuda_args + +// CHECK: #include +#include +// CHECK: #include +#include +#include +#include + +#define DATASIZE 8 +#define BATCH 2 + +#define gpuErrchk(ans) { gpuAssert((ans), __FILE__, __LINE__); } +// CHECK: inline void gpuAssert(hipError_t code, const char *file, int line, bool abort = true) +inline void gpuAssert(cudaError_t code, const char *file, int line, bool abort = true) +{ + // CHECK: if (code != hipSuccess) + if (code != cudaSuccess) + { + // CHECK: fprintf(stderr, "GPUassert: %s %s %dn", hipGetErrorString(code), file, line); + fprintf(stderr, "GPUassert: %s %s %dn", cudaGetErrorString(code), file, line); + if (abort) exit(code); + } +} + +int main() +{ + // --- Host side input data allocation and initialization + // CHECK: hipfftReal *hostInputData = (hipfftReal*)malloc(DATASIZE*BATCH * sizeof(hipfftReal)); + cufftReal *hostInputData = (cufftReal*)malloc(DATASIZE*BATCH * sizeof(cufftReal)); + for (int i = 0; iHost copy of the results + // CHECK: gpuErrchk(hipMemcpy(hostOutputData, deviceOutputData, (DATASIZE / 2 + 1) * BATCH * sizeof(hipfftComplex), hipMemcpyDeviceToHost)); + gpuErrchk(cudaMemcpy(hostOutputData, deviceOutputData, (DATASIZE / 2 + 1) * BATCH * sizeof(cufftComplex), cudaMemcpyDeviceToHost)); + + for (int i = 0; i +// CHECK: #include "hipfft.h" + #include #include @@ -91,3 +93,5 @@ #include "curand_uniform.h" #include + +#include "cufft.h" From 12414015faf99463c736433738b6f24619a208e4 Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Tue, 31 Jul 2018 20:38:20 +0000 Subject: [PATCH 27/29] Enable hipHccModuleLaunchKernel on HIP-Clang [ROCm/hip commit: d1149a9b64ab7a1ea7e0442381685915a7cf888e] --- projects/hip/include/hip/hcc_detail/hip_runtime.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/hip/include/hip/hcc_detail/hip_runtime.h b/projects/hip/include/hip/hcc_detail/hip_runtime.h index c2ae6e8e4f..1475cd6eec 100644 --- a/projects/hip/include/hip/hcc_detail/hip_runtime.h +++ b/projects/hip/include/hip/hcc_detail/hip_runtime.h @@ -450,6 +450,14 @@ extern const __device__ __attribute__((weak)) __hip_builtin_gridDim_t gridDim; #include -#endif +hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX, + uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ, + uint32_t localWorkSizeX, uint32_t localWorkSizeY, + uint32_t localWorkSizeZ, size_t sharedMemBytes, + hipStream_t hStream, void** kernelParams, void** extra, + hipEvent_t startEvent = nullptr, + hipEvent_t stopEvent = nullptr); + +#endif // defined(__clang__) && defined(__HIP__) #endif // HIP_HCC_DETAIL_RUNTIME_H From a210507dcb060a34af2ee5d935e77315b54a0552 Mon Sep 17 00:00:00 2001 From: lthakur Date: Wed, 1 Aug 2018 10:41:30 +0530 Subject: [PATCH 28/29] Added offset value verification. Added offset value verification. [ROCm/hip commit: 26f944b1c1e7d4bc7a66c083cbcbd77dbafc429a] --- projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp index 2343d7a7fb..3a4cc7dfc8 100644 --- a/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp +++ b/projects/hip/tests/src/texture/hipGetAlgntoffset2D.cpp @@ -71,5 +71,8 @@ HIPCHECK(hipBindTextureToArray(&tex, hipArray, &chan_desc)); HIPCHECK(hipGetTextureAlignmentOffset(&offset,&tex)); HIPCHECK(hipUnbindTexture(&tex)); HIPCHECK(hipFreeArray(hipArray)); -return true; +if(offset != 0) + return false; + else + return true; } From ac82ada918baa56057e1cc5b59f2b988629af3d9 Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Wed, 1 Aug 2018 17:29:00 +0300 Subject: [PATCH 29/29] [HIPIFY][docs] Formatting [ROCm/hip commit: 0fe661b182e64701fcd42dcee74ba5445f3dc3c9] --- projects/hip/hipify-clang/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/hip/hipify-clang/README.md b/projects/hip/hipify-clang/README.md index fdb37d2e2d..d5a825033d 100644 --- a/projects/hip/hipify-clang/README.md +++ b/projects/hip/hipify-clang/README.md @@ -17,7 +17,7 @@ -##Supported CUDA APIs +## Supported CUDA APIs - [Runtime API](../docs/markdown/CUDA_Runtime_API_functions_supported_by_HIP.md) - [Driver API](../docs/markdown/CUDA_Driver_API_functions_supported_by_HIP.md) @@ -26,7 +26,7 @@ - [cuDNN](../docs/markdown/CUDNN_API_supported_by_HIP.md) - [cuFFT](../docs/markdown/CUFFT_API_supported_by_HIP.md) -##Dependencies +## Dependencies `hipify-clang` requires: 1. LLVM+CLANG of at least version 3.8.0, latest stable and recommended release is 6.0.1. @@ -51,9 +51,9 @@ In most cases, you can get a suitable version of LLVM+CLANG with your package ma Failing that or having multiple versions of LLVM, you can [download a release archive](http://releases.llvm.org/), build or install it, and set [CMAKE_PREFIX_PATH](https://cmake.org/cmake/help/v3.10/variable/CMAKE_PREFIX_PATH.html) so `cmake` can find it; for instance: `-DCMAKE_PREFIX_PATH=f:\LLVM\6.0.1\dist` -##Build and install +## Build and install -###Build +### Build Assuming this repository is at `./HIP`: @@ -76,7 +76,7 @@ Debug build type `-DCMAKE_BUILD_TYPE=Debug` is also supported and tested, `LLVM+ The binary can then be found at `./dist/bin/hipify-clang`. -###Test +### Test `hipify-clang` has unit tests using LLVM [`lit`](https://llvm.org/docs/CommandGuide/lit.html)/[`FileCheck`](https://llvm.org/docs/CommandGuide/FileCheck.html). @@ -136,7 +136,7 @@ To run it: On Windows after `cmake` the project `test-hipify` in the generated `hipify-clang.sln` should be built by `Visual Studio 15 2017` instead of `make test-hipify`. -###Windows +### Windows On Windows the following configurations are tested: @@ -179,7 +179,7 @@ A corresponding successful output: -- Build files have been written to: f:/HIP/hipify-clang/build ``` -##Running and using hipify-clang +## Running and using hipify-clang To process a file, `hipify-clang` needs access to the same headers that would be needed to compile it with clang. @@ -200,7 +200,7 @@ may be useful. For a list of `hipify-clang` options, run `hipify-clang --help`. -##Disclaimer +## Disclaimer The information contained herein is for informational purposes only, and is subject to change without notice. While every precaution has been taken in the preparation of this document, it may contain technical inaccuracies, omissions and typographical errors, and AMD is under no obligation to update or otherwise correct this information. Advanced Micro Devices, Inc. makes no representations or warranties with respect to the accuracy or completeness of the contents of this document, and assumes no liability of any kind, including the implied warranties of noninfringement, merchantability or fitness for particular purposes, with respect to the operation or use of AMD hardware, software or other products described herein. No license, including implied or arising by estoppel, to any intellectual property rights is granted by this document. Terms and limitations applicable to the purchase or use of AMD's products are as set forth in a signed agreement between the parties or in AMD's Standard Terms and Conditions of Sale.