mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
1dfbd4eff2
-Add new preset dimensions to the right click menu of the width and height fields in the editor. -Change QSS stylesheets to properly handle tabs. -Make tabs rectangular by default. For some reason, they had always been triangular. --Bug fixes -Incremental rendering times in the editor were wrong. --Code changes -Migrate to Qt6. There is probably more work to be done here. -Migrate to VS2022. -Migrate to Wix 4 installer. -Change installer to install to program files for all users. -Fix many VS2022 code analysis warnings. -No longer use byte typedef, because std::byte is now a type. Revert all back to unsigned char. -Upgrade OpenCL headers to version 3.0 and keep locally now rather than trying to look for system files. -No longer link to Nvidia or AMD specific OpenCL libraries. Use the generic installer located at OCL_ROOT too. -Add the ability to change OpenCL grid dimensions. This was attempted for investigating possible performance improvments, but made no difference. This has not been verified on Linux or Mac yet.
74 lines
2.1 KiB
C++
Executable File
74 lines
2.1 KiB
C++
Executable File
#ifdef _WIN32
|
|
#pragma once
|
|
#endif
|
|
|
|
/// <summary>
|
|
/// Precompiled header file. Place all system includes here with appropriate #defines for different operating systems and compilers.
|
|
/// </summary>
|
|
|
|
#define NOMINMAX
|
|
#define WIN32_LEAN_AND_MEAN//Exclude rarely-used stuff from Windows headers.
|
|
#define _USE_MATH_DEFINES
|
|
//#define CL_USE_DEPRECATED_OPENCL_1_2_APIS 1
|
|
//#define CL_USE_DEPRECATED_OPENCL_2_0_APIS 1
|
|
//For reasons unknown, QtCreator cannot use any value higher than 120 with these, because
|
|
//it causes errors when compiling opencl.hpp. This happens even though it's using MSVC under the hood
|
|
//and it compiles in MSVC when using Visual Studio.
|
|
#define CL_TARGET_OPENCL_VERSION 300
|
|
#define CL_HPP_TARGET_OPENCL_VERSION 300
|
|
#define CL_HPP_MINIMUM_OPENCL_VERSION 300
|
|
|
|
#include "Timing.h"
|
|
#include "Renderer.h"
|
|
|
|
#if defined(_WIN32)
|
|
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
|
#include <windows.h>
|
|
#include <SDKDDKVer.h>
|
|
#include "GL/gl.h"
|
|
#elif defined(__APPLE__)
|
|
#include <OpenGL/gl.h>
|
|
#else
|
|
#include "GL/glx.h"
|
|
#endif
|
|
|
|
#include <utility>
|
|
#include <CL/opencl.hpp>
|
|
#include <algorithm>
|
|
#include <atomic>
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <set>
|
|
#include <string>
|
|
#include <iterator>
|
|
#include <time.h>
|
|
#include <unordered_map>
|
|
|
|
#ifdef _WIN32
|
|
#if defined(BUILDING_EMBERCL)
|
|
#define EMBERCL_API __declspec(dllexport)
|
|
#else
|
|
#define EMBERCL_API __declspec(dllimport)
|
|
#endif
|
|
#else
|
|
#define EMBERCL_API
|
|
#endif
|
|
|
|
using namespace std;
|
|
using namespace EmberNs;
|
|
//#define TEST_CL 1
|
|
//#define TEST_CL_BUFFERS 1
|
|
|
|
//This special define is made to fix buggy OpenCL compilers on Mac.
|
|
//Rendering is much slower there for unknown reasons. Michel traced it down
|
|
//to the consec variable which keeps track of how many tries are needed to compute
|
|
//a point which is not a bad value. Strangely, keeping this as a local variable
|
|
//is slower than keeping it as an element in a global array.
|
|
//This is counterintuitive, and lends further weight to the idea that OpenCL on Mac
|
|
//is horribly broken.
|
|
#ifdef __APPLE__
|
|
#define KNL_USE_GLOBAL_CONSEC
|
|
#endif
|