mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
a800b08b67
-Add variations changes to the list of functionality that can be applied to all xforms using the Select tab. -Allow for graphical affine adjustments to apply to multiple selected xforms. -Slight optimization of the pie variation. -Undo state is only saved when the render completes and the mouse buttons are released. This helps avoid intermediate steps for quickly completing renders while dragging. -Add some keyboard shortcuts for toolbar and menu items. -Make info tab tree always expanded. --Bug fixes -Make precalcs for all hypertile variations safer by using Zeps() for denominators. -Changing the current xform with more than one selected would set all xform's color index value that of the current one. -Use hard found palette path information for randoms as well. -OpenCL build and assignment errors for Z value in epispiral variation. -Unitialized local variables in hexaplay3D, crob, pRose3D. --Code changes -Change static member variables from m_ to s_. -Get rid of excessive endl and replace with "\n". -Remove old IMAGEGL2D define from before Nvidia supported OpenCL 1.2. -Remove old CriticalSection code and use std::recursive_mutex. -Make Affine2D Rotate() and RotateTrans() take radians instead of angles. -More C++11 work. -General cleanup.
83 lines
2.8 KiB
C++
83 lines
2.8 KiB
C++
#pragma once
|
|
|
|
#include "EmberCLPch.h"
|
|
#include "EmberCLStructs.h"
|
|
#include "EmberCLFunctions.h"
|
|
#include "FunctionMapper.h"
|
|
|
|
/// <summary>
|
|
/// IterOpenCLKernelCreator class.
|
|
/// </summary>
|
|
|
|
namespace EmberCLns
|
|
{
|
|
/// <summary>
|
|
/// Class for creating the main iteration code in OpenCL.
|
|
/// It uses the Cuburn method of iterating where all conditionals
|
|
/// are stripped out and a specific kernel is compiled at run-time.
|
|
/// It uses a very sophisticated method for randomization that avoids
|
|
/// the problem of warp/wavefront divergence that would occur if every
|
|
/// thread selected a random xform to apply.
|
|
/// This only works with embers of type float, double is not supported.
|
|
/// </summary>
|
|
template <typename T>
|
|
class EMBERCL_API IterOpenCLKernelCreator
|
|
{
|
|
public:
|
|
IterOpenCLKernelCreator();
|
|
const string& ZeroizeKernel() const;
|
|
const string& ZeroizeEntryPoint() const;
|
|
const string& SumHistKernel() const;
|
|
const string& SumHistEntryPoint() const;
|
|
const string& IterEntryPoint() const;
|
|
string CreateIterKernelString(const Ember<T>& ember, const string& parVarDefines, const string& globalSharedDefines, bool lockAccum = false, bool doAccum = true);
|
|
string GlobalFunctionsString(const Ember<T>& ember);
|
|
static void ParVarIndexDefines(const Ember<T>& ember, pair<string, vector<T>>& params, bool doVals = true, bool doString = true);
|
|
static void SharedDataIndexDefines(const Ember<T>& ember, pair<string, vector<T>>& params, bool doVals = true, bool doString = true);
|
|
static string VariationStateString(const Ember<T>& ember);
|
|
static string VariationStateInitString(const Ember<T>& ember);
|
|
static bool IsBuildRequired(const Ember<T>& ember1, const Ember<T>& ember2);
|
|
|
|
private:
|
|
string CreateZeroizeKernelString() const;
|
|
string CreateSumHistKernelString() const;
|
|
string CreateProjectionString(const Ember<T>& ember) const;
|
|
|
|
string m_IterEntryPoint;
|
|
string m_ZeroizeKernel;
|
|
string m_ZeroizeEntryPoint;
|
|
string m_SumHistKernel;
|
|
string m_SumHistEntryPoint;
|
|
FunctionMapper m_FunctionMapper;
|
|
};
|
|
|
|
#ifdef OPEN_CL_TEST_AREA
|
|
typedef void (*KernelFuncPointer) (size_t gridWidth, size_t gridHeight, size_t blockWidth, size_t blockHeight,
|
|
size_t BLOCK_ID_X, size_t BLOCK_ID_Y, size_t THREAD_ID_X, size_t THREAD_ID_Y);
|
|
|
|
static void OpenCLSim(size_t gridWidth, size_t gridHeight, size_t blockWidth, size_t blockHeight, KernelFuncPointer func)
|
|
{
|
|
cout << "OpenCLSim(): ";
|
|
cout << "\n Params: ";
|
|
cout << "\n gridW: " << gridWidth;
|
|
cout << "\n gridH: " << gridHeight;
|
|
cout << "\n blockW: " << blockWidth;
|
|
cout << "\n blockH: " << blockHeight;
|
|
|
|
for (size_t i = 0; i < gridHeight; i += blockHeight)
|
|
{
|
|
for (size_t j = 0; j < gridWidth; j += blockWidth)
|
|
{
|
|
for (size_t k = 0; k < blockHeight; k++)
|
|
{
|
|
for (size_t l = 0; l < blockWidth; l++)
|
|
{
|
|
func(gridWidth, gridHeight, blockWidth, blockHeight, j / blockWidth, i / blockHeight, l, k);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|