mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-01 13:56:06 -04:00
--Bug fixes
-Really fix locking of affine scale. --Code changes -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder. --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports. --Remove libpng16.dll from Wix installer. -Remove all configs except for debug and release. -Remove all platforms except for x64. -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds. -Put Ember.rc in a filter folder in the project. -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator. -Move all resource files to the MSVC folder. -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl. -Rework projects to favor shadow builds. -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files. -Change WIN32 to _WIN32. -Fix a few code warnings.
This commit is contained in:
@ -147,11 +147,10 @@ uint DEOpenCLKernelCreator::MaxDEFilterSize() { return 9; }//The true max would
|
||||
/// size of up to 9: (20 - 1) / 2 == (19 / 2) == 9 could be supported.
|
||||
/// This function is deprecated, the appropriate kernels take care of this problem now.
|
||||
/// </summary>
|
||||
/// <param name="maxBoxSize">Maximum size of the box.</param>
|
||||
/// <param name="desiredFilterSize">Size of the desired filter.</param>
|
||||
/// <param name="ss">The supersample being used</param>
|
||||
/// <returns>The maximum filter radius allowed</returns>
|
||||
double DEOpenCLKernelCreator::SolveMaxDERad(uint maxBoxSize, double desiredFilterSize, double ss)
|
||||
double DEOpenCLKernelCreator::SolveMaxDERad(double desiredFilterSize, double ss)
|
||||
{
|
||||
uint finalFilterSize = uint((ceil(desiredFilterSize) * ss) + (ss - 1.0));
|
||||
|
||||
|
@ -41,7 +41,7 @@ public:
|
||||
|
||||
//Miscellaneous static functions.
|
||||
static uint MaxDEFilterSize();
|
||||
static double SolveMaxDERad(uint maxBoxSize, double desiredFilterSize, double ss);
|
||||
static double SolveMaxDERad(double desiredFilterSize, double ss);
|
||||
static uint SolveMaxBoxSize(uint localMem);
|
||||
|
||||
private:
|
||||
|
@ -1,4 +1,4 @@
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#pragma once
|
||||
#endif
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
#include "Renderer.h"
|
||||
|
||||
#if defined(_WIN32)
|
||||
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
||||
#include <windows.h>
|
||||
#include <SDKDDKVer.h>
|
||||
#include "GL/gl.h"
|
||||
|
@ -119,7 +119,7 @@ bool RendererCL<T, bucketT>::Init(const vector<pair<size_t, size_t>>& devices, b
|
||||
{
|
||||
try
|
||||
{
|
||||
unique_ptr<RendererClDevice> cld(new RendererClDevice(typeid(T) == typeid(double), devices[i].first, devices[i].second, i == 0 ? shared : false));
|
||||
unique_ptr<RendererClDevice> cld(new RendererClDevice(devices[i].first, devices[i].second, i == 0 ? shared : false));
|
||||
|
||||
if ((b = cld->Init()))//Build a simple program to ensure OpenCL is working right.
|
||||
{
|
||||
|
@ -12,7 +12,7 @@ namespace EmberCLns
|
||||
/// <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)
|
||||
RendererClDevice::RendererClDevice(size_t platform, size_t device, bool shared)
|
||||
{
|
||||
m_Init = false;
|
||||
m_Shared = shared;
|
||||
|
@ -18,7 +18,7 @@ namespace EmberCLns
|
||||
class EMBERCL_API RendererClDevice : public EmberReport
|
||||
{
|
||||
public:
|
||||
RendererClDevice(bool doublePrec, size_t platform, size_t device, bool shared);
|
||||
RendererClDevice(size_t platform, size_t device, bool shared);
|
||||
bool Init();
|
||||
bool Ok() const;
|
||||
bool Shared() const;
|
||||
|
Reference in New Issue
Block a user