mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 13:56:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Update OpenCL includes.
This commit is contained in:
Person
2023-07-19 14:09:46 -06:00
parent 25e3a7722e
commit 7c8fdfdfaa
10 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/EmberCL/EmberCLPch.h
View File

@ -14,8 +14,8 @@
//This is counterintuitive, and lends further weight to the idea that OpenCL on Mac
//is horribly broken.
#ifdef __APPLE__
#define KNL_USE_GLOBAL_CONSEC
#define OCL_USE_1_2_V
#define KNL_USE_GLOBAL_CONSEC
#define OCL_USE_1_2_V
#endif
#define NOMINMAX
@ -27,9 +27,9 @@
//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.
#ifndef OCL_USE_1_2_V
#define CL_TARGET_OPENCL_VERSION 300
#define CL_HPP_TARGET_OPENCL_VERSION 300
#define CL_HPP_MINIMUM_OPENCL_VERSION 300
#define CL_TARGET_OPENCL_VERSION 300
#define CL_HPP_TARGET_OPENCL_VERSION 300
#define CL_HPP_MINIMUM_OPENCL_VERSION 300
#endif
#include "Timing.h"
@ -48,9 +48,9 @@
#include <utility>
#ifdef OCL_USE_1_2_V
#include <CL/cl.hpp>
#include <CL/cl.hpp>
#else
#include <CL/opencl.hpp>
#include <CL/opencl.hpp>
#endif
#include <algorithm>
#include <atomic>

26
Source/EmberCL/OpenCLWrapper.cpp
View File

@ -466,11 +466,11 @@ bool OpenCLWrapper::WriteImage2D(size_t index, bool shared, ::size_t width, ::si
if (m_Init)
{
cl_int err;
cl::Event e;
cl::Event e;
#ifdef OCL_USE_1_2_V
cl::size_t<3> origin, region;
cl::size_t<3> origin, region;
#else
cl::array<cl::size_type, 3> origin, region;
cl::array<cl::size_type, 3> origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
@ -544,9 +544,9 @@ bool OpenCLWrapper::ReadImage(size_t imageIndex, ::size_t width, ::size_t height
cl_int err;
cl::Event e;
#ifdef OCL_USE_1_2_V
cl::size_t<3> origin, region;
cl::size_t<3> origin, region;
#else
cl::array<cl::size_type, 3> origin, region;
cl::array<cl::size_type, 3> origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
@ -808,9 +808,9 @@ bool OpenCLWrapper::EnqueueReleaseGLObjects(cl::ImageGL& image)
/// <param name="memObjects">The memory objects to acquire</param>
/// <returns>True if success, else false.</returns>
#ifdef OCL_USE_1_2_V
bool OpenCLWrapper::EnqueueAcquireGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects)
bool OpenCLWrapper::EnqueueAcquireGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects)
#else
bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObjects)
bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObjects)
#endif
{
if (m_Init && m_Shared)
@ -829,9 +829,9 @@ bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObj
/// <param name="memObjects">The memory objects to release</param>
/// <returns>True if success, else false.</returns>
#ifdef OCL_USE_1_2_V
bool OpenCLWrapper::EnqueueReleaseGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects)
bool OpenCLWrapper::EnqueueReleaseGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects)
#else
bool OpenCLWrapper::EnqueueReleaseGLObjects(const cl::vector<cl::Memory>* memObjects)
bool OpenCLWrapper::EnqueueReleaseGLObjects(const cl::vector<cl::Memory>* memObjects)
#endif
{
if (m_Init && m_Shared)
@ -1073,13 +1073,13 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s
{
cl_int err;
#ifndef OCL_USE_1_2_V
vector<std::string> programvec{ program };
vector<std::string> programvec { program };
#endif
spk.m_Name = name;
spk.m_Name = name;
#ifdef OCL_USE_1_2_V
spk.m_Source = cl::Program::Sources(1, std::make_pair(program.c_str(), program.length() + 1));
spk.m_Source = cl::Program::Sources(1, std::make_pair(program.c_str(), program.length() + 1));
#else
spk.m_Source = cl::Program::Sources(programvec);
spk.m_Source = cl::Program::Sources(programvec);
#endif
spk.m_Program = cl::Program(m_Context, spk.m_Source);

10
Source/EmberCL/OpenCLWrapper.h
View File

@ -134,13 +134,13 @@ public:
bool EnqueueReleaseGLObjects(const string& name);
bool EnqueueReleaseGLObjects(cl::ImageGL& image);
#ifdef OCL_USE_1_2_V
bool EnqueueAcquireGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects = nullptr);
bool EnqueueReleaseGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects = nullptr);
bool EnqueueAcquireGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects = nullptr);
bool EnqueueReleaseGLObjects(const VECTOR_CLASS<cl::Memory>* memObjects = nullptr);
#else
bool EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObjects = nullptr);
bool EnqueueReleaseGLObjects(const cl::vector<cl::Memory>* memObjects = nullptr);
bool EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObjects = nullptr);
bool EnqueueReleaseGLObjects(const cl::vector<cl::Memory>* memObjects = nullptr);
#endif
bool CreateSampler(cl::Sampler& sampler, cl_bool normalizedCoords, cl_addressing_mode addressingMode, cl_filter_mode filterMode);
bool CreateSampler(cl::Sampler& sampler, cl_bool normalizedCoords, cl_addressing_mode addressingMode, cl_filter_mode filterMode);
//Arguments.
bool SetBufferArg(size_t kernelIndex, cl_uint argIndex, const string& name);