summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-02-16 17:53:24 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-02-16 17:53:24 +0100
commit3743fdc534b39958c105f4124ad1130d3e8b042a (patch)
tree1385761a94fe1abb34291bf5052a3abfe45b5a6a /src
parentc041ce4fabcafe263bb93ca481040ed32ed5c5f2 (diff)
downloadastra-3743fdc534b39958c105f4124ad1130d3e8b042a.tar.gz
astra-3743fdc534b39958c105f4124ad1130d3e8b042a.tar.bz2
astra-3743fdc534b39958c105f4124ad1130d3e8b042a.tar.xz
astra-3743fdc534b39958c105f4124ad1130d3e8b042a.zip
Query max texture size instead of hardcoding it
Diffstat (limited to 'src')
-rw-r--r--src/CompositeGeometryManager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp
index cafc452..c9cbaaa 100644
--- a/src/CompositeGeometryManager.cpp
+++ b/src/CompositeGeometryManager.cpp
@@ -55,9 +55,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
namespace astra {
-static const size_t MAX_BLOCK_DIM = 4096;
-
-
SGPUParams* CCompositeGeometryManager::s_params = 0;
CCompositeGeometryManager::CCompositeGeometryManager()
@@ -102,6 +99,9 @@ CCompositeGeometryManager::CCompositeGeometryManager()
bool CCompositeGeometryManager::splitJobs(TJobSet &jobs, size_t maxSize, int div, TJobSet &split)
{
+ int maxBlockDim = astraCUDA3d::maxBlockDimension();
+ ASTRA_DEBUG("Found max block dim %d", maxBlockDim);
+
split.clear();
for (TJobSet::const_iterator i = jobs.begin(); i != jobs.end(); ++i)
@@ -159,17 +159,17 @@ bool CCompositeGeometryManager::splitJobs(TJobSet &jobs, size_t maxSize, int div
size_t remainingSize = ( maxSize - outputPart->getSize() ) / 2;
TPartList splitInput;
- input->splitZ(splitInput, remainingSize, MAX_BLOCK_DIM, 1);
+ input->splitZ(splitInput, remainingSize, maxBlockDim, 1);
delete input;
TPartList splitInput2;
for (TPartList::iterator i_in = splitInput.begin(); i_in != splitInput.end(); ++i_in) {
boost::shared_ptr<CPart> inputPart = *i_in;
- inputPart.get()->splitX(splitInput2, SIZE_MAX, MAX_BLOCK_DIM, 1);
+ inputPart.get()->splitX(splitInput2, SIZE_MAX, maxBlockDim, 1);
}
splitInput.clear();
for (TPartList::iterator i_in = splitInput2.begin(); i_in != splitInput2.end(); ++i_in) {
boost::shared_ptr<CPart> inputPart = *i_in;
- inputPart.get()->splitY(splitInput, SIZE_MAX, MAX_BLOCK_DIM, 1);
+ inputPart.get()->splitY(splitInput, SIZE_MAX, maxBlockDim, 1);
}
splitInput2.clear();