AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1121131 by bwicakso@opencl-hsa-stg-bwicakso on 2015/02/11 12:55:55

Browse Source 
EPR #414268 - Back out changelist 1121106

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/brig_loader.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/sc-hsa/Interface/hsa_ext_finalize.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#279 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#190 edit
This commit is contained in:
foreman
2015-02-11 13:06:36 -05:00
parent 13efca9690
commit 2af2557e26
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/gpu/gpuprogram.cpp
+7 -7
View File
@@ -102,26 +102,26 @@ InitializeSamplerObject(void* userData, uint64_t offset, bool unnormalize,
uint32_t state = (unnormalize) ?
amd::Sampler::StateNormalizedCoordsFalse : amd::Sampler::StateNormalizedCoordsTrue;
if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) {
state |= amd::Sampler::StateFilterNearest;
}
else if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
else if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) {
state |= amd::Sampler::StateFilterLinear;
}
switch (boundaryU) {
case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_EDGE:
case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE:
state |= amd::Sampler::StateAddressClampToEdge;
break;
case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_BORDER:
case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_BORDER:
state |= amd::Sampler::StateAddressClamp;
break;
case HSA_EXT_SAMPLER_ADDRESSING_REPEAT:
case HSA_EXT_SAMPLER_ADDRESSING_MODE_REPEAT:
state |= amd::Sampler::StateAddressRepeat;
break;
case HSA_EXT_SAMPLER_ADDRESSING_MIRRORED_REPEAT:
case HSA_EXT_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT:
state |= amd::Sampler::StateAddressMirroredRepeat;
break;
case HSA_EXT_SAMPLER_ADDRESSING_UNDEFINED:
case HSA_EXT_SAMPLER_ADDRESSING_MODE_UNDEFINED:
default:
break;
}