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

P4 to Git Change 1136253 by gandryey@gera-w8 on 2015/03/31 12:51:46

Browse Source 
ECR #304775 - Mipmaps support in OCL
	- Add changes for the sampler usage with mipmaped images

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_sampler.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#504 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#141 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#113 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#46 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/sampler.hpp#7 edit
This commit is contained in:
foreman
2015-03-31 13:06:05 -04:00
parent 9bff526ef0
commit 11dbd14b90
5 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/gpu/gpudevice.cpp
+35 -5
View File
@@ -1904,7 +1904,7 @@ Device::createSampler(const amd::Sampler& owner, device::Sampler** sampler) cons
*sampler = NULL;
if (settings().hsail_ || (settings().oclVersion_ >= OpenCL20)) {
Sampler* gpuSampler = new Sampler(*this);
if ((NULL == gpuSampler) || !gpuSampler->create(owner.state())) {
if ((NULL == gpuSampler) || !gpuSampler->create(owner)) {
delete gpuSampler;
return false;
}
@@ -2449,7 +2449,9 @@ Device::destroyScratchBuffers()
}
void
Device::fillHwSampler(uint32_t state, void* hwState, uint32_t hwStateSize) const
Device::fillHwSampler(
uint32_t state, void* hwState, uint32_t hwStateSize,
uint32_t mipFilter, float minLod, float maxLod) const
{
// All GSL sampler's parameters are in floats
uint32_t gslAddress = GSL_CLAMP_TO_BORDER;
@@ -2483,8 +2485,25 @@ Device::fillHwSampler(uint32_t state, void* hwState, uint32_t hwStateSize) const
gslMagFilter = GSL_MAG_LINEAR;
}
if (mipFilter == CL_FILTER_NEAREST) {
if (gslMinFilter == GSL_MIN_NEAREST) {
gslMinFilter = GSL_MIN_NEAREST_MIPMAP_NEAREST;
}
else {
gslMinFilter = GSL_MIN_LINEAR_MIPMAP_NEAREST;
}
}
else if (mipFilter == CL_FILTER_LINEAR) {
if (gslMinFilter == GSL_MIN_NEAREST) {
gslMinFilter = GSL_MIN_NEAREST_MIPMAP_LINEAR;
}
else {
gslMinFilter = GSL_MIN_LINEAR_MIPMAP_LINEAR;
}
}
fillSamplerHwState(unnorm, gslMinFilter, gslMagFilter,
gslAddress, hwState, hwStateSize);
gslAddress, minLod, maxLod, hwState, hwStateSize);
}
void*
@@ -2564,8 +2583,7 @@ Device::SrdManager::~SrdManager()
}
bool
Sampler::create(
uint32_t oclSamplerState)
Sampler::create(uint32_t oclSamplerState)
{
hwSrd_ = dev_.srds().allocSrdSlot(&hwState_);
if (0 == hwSrd_) {
@@ -2575,6 +2593,18 @@ Sampler::create(
return true;
}
bool
Sampler::create(const amd::Sampler& owner)
{
hwSrd_ = dev_.srds().allocSrdSlot(&hwState_);
if (0 == hwSrd_) {
return false;
}
dev_.fillHwSampler(owner.state(), hwState_, HsaSamplerObjectSize,
owner.mipFilter(), owner.minLod(), owner.maxLod());
return true;
}
Sampler::~Sampler()
{
dev_.srds().freeSrdSlot(hwSrd_);