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

final macOS

Browse Source
This commit is contained in:
Michel Mastriani
2023-07-18 22:50:43 -03:00
parent 2c0d4fbfe9
commit ec35cf92c7
46 changed files with 16185 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/EmberCL/OpenCLWrapper.cpp
View File

@ -466,8 +466,12 @@ bool OpenCLWrapper::WriteImage2D(size_t index, bool shared, ::size_t width, ::si
if (m_Init)
{
cl_int err;
cl::Event e;
cl::array<cl::size_type, 3> origin, region;
cl::Event e;
#ifdef OCL_USE_1_2_V
cl::size_t<3> origin, region;
#else
cl::array<cl::size_type, 3> origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
origin[2] = 0;
@ -539,7 +543,11 @@ bool OpenCLWrapper::ReadImage(size_t imageIndex, ::size_t width, ::size_t height
{
cl_int err;
cl::Event e;
cl::array<cl::size_type, 3> origin, region;
#ifdef OCL_USE_1_2_V
cl::size_t<3> origin, region;
#else
cl::array<cl::size_type, 3> origin, region;
#endif
origin[0] = 0;
origin[1] = 0;
origin[2] = 0;
@ -799,7 +807,11 @@ bool OpenCLWrapper::EnqueueReleaseGLObjects(cl::ImageGL& image)
/// </summary>
/// <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)
#else
bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObjects)
#endif
{
if (m_Init && m_Shared)
{
@ -816,7 +828,11 @@ bool OpenCLWrapper::EnqueueAcquireGLObjects(const cl::vector<cl::Memory>* memObj
/// </summary>
/// <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)
#else
bool OpenCLWrapper::EnqueueReleaseGLObjects(const cl::vector<cl::Memory>* memObjects)
#endif
{
if (m_Init && m_Shared)
{
@ -1056,9 +1072,15 @@ bool OpenCLWrapper::CreateSPK(const string& name, const string& program, const s
if (m_Init)
{
cl_int err;
vector<std::string> programvec{ program };
spk.m_Name = name;
spk.m_Source = cl::Program::Sources(programvec);
#ifndef OCL_USE_1_2_V
vector<std::string> programvec{ program };
#endif
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));
#else
spk.m_Source = cl::Program::Sources(programvec);
#endif
spk.m_Program = cl::Program(m_Context, spk.m_Source);
if (doublePrecision)