mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
6ba16888e3
-Add new variations: crackle, dc_perlin. -Make default palette interp mode be linear instead of step. -Make summary tab the selected one in the Info tab. -Allow for highlight power of up to 10. It was previously limited to 2. --Bug fixes -Direct color calculations were wrong. -Flattening was not applied to final xform. -Fix "pure virtual function call" error on shutdown. --Code changes -Allow for array precalc params in variations by adding a size member to the ParamWithName class. -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length. -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin. -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project. -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern. -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on. -Add missing backslash to CUDA include and library paths for builds on Nvidia systems. -Add missing gl.h include for Windows. -Remove glew include paths from Fractorium, it's not used. -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2. -Fix bad paths on linux build. -General cleanup.
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
#include "EmberCLPch.h"
|
|
#include "RendererClDevice.h"
|
|
|
|
namespace EmberCLns
|
|
{
|
|
/// <summary>
|
|
/// Constructor that assigns members.
|
|
/// The object is not fully initialized at this point, the caller
|
|
/// must manually call Init().
|
|
/// </summary>
|
|
/// <param name="platform">The index of the platform to use</param>
|
|
/// <param name="device">The index device of the device to use</param>
|
|
/// <param name="shared">True if shared with OpenGL, else false.</param>
|
|
/// <returns>True if success, else false.</returns>
|
|
RendererClDevice::RendererClDevice(bool doublePrec, size_t platform, size_t device, bool shared)
|
|
{
|
|
m_Init = false;
|
|
m_Shared = shared;
|
|
m_NVidia = false;
|
|
m_WarpSize = 0;
|
|
m_Calls = 0;
|
|
m_PlatformIndex = platform;
|
|
m_DeviceIndex = device;
|
|
m_Info = OpenCLInfo::Instance();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Initialization of the OpenCLWrapper member.
|
|
/// </summary>
|
|
/// <returns>True if success, else false.</returns>
|
|
bool RendererClDevice::Init()
|
|
{
|
|
bool b = true;
|
|
|
|
if (!m_Wrapper.Ok())
|
|
{
|
|
m_Init = false;
|
|
b = m_Wrapper.Init(m_PlatformIndex, m_DeviceIndex, m_Shared);
|
|
}
|
|
|
|
if (b && m_Wrapper.Ok() && !m_Init)
|
|
{
|
|
m_NVidia = ToLower(m_Info->PlatformName(m_PlatformIndex)).find_first_of("nvidia") != string::npos && m_Wrapper.LocalMemSize() > (32 * 1024);
|
|
m_WarpSize = m_NVidia ? 32 : 64;
|
|
m_Init = true;
|
|
}
|
|
|
|
return b;
|
|
}
|
|
|
|
/// <summary>
|
|
/// OpenCL property accessors, getters only.
|
|
/// </summary>
|
|
bool RendererClDevice::Ok() const { return m_Init; }
|
|
bool RendererClDevice::Shared() const { return m_Shared; }
|
|
bool RendererClDevice::Nvidia() const { return m_NVidia; }
|
|
size_t RendererClDevice::WarpSize() const { return m_WarpSize; }
|
|
size_t RendererClDevice::PlatformIndex() const { return m_PlatformIndex; }
|
|
size_t RendererClDevice::DeviceIndex() const { return m_DeviceIndex; }
|
|
}
|