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

Additional changes to work with Simon's pull request.

Browse Source 
-Remove unneeded glFinish() call in GLWidget.
-Remove unneeded AMD_OS_WIN preprocessor in several projects.
-Define NVIDIA in all projects that use the NvidiaRelease build and depend on OpenCL.
This commit is contained in:
mfeemster
2015-01-29 18:22:15 -08:00
parent 301b6ee452
commit b1d5db261b
9 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Ember/Ember.h
View File

@ -44,6 +44,10 @@ public:
Init();
}
/// <summary>
/// Copy constructor to copy an Ember object of the same type.
/// </summary>
/// <param name="ember">The Ember object to copy</param>
Ember(const Ember<T>& ember)
: m_Edits(nullptr)
{
@ -69,8 +73,12 @@ public:
ClearEdit();
}
//For some reason the compiler requires Xform to define two assignment operators,
//however it gets confused when Ember has two.
/// <summary>
/// Assignment operator to copy an Ember object of the same type.
/// For some reason the compiler requires Xform to define two assignment operators,
/// however it gets confused when Ember has two.
/// </summary>
/// <param name="ember">The Ember object to copy</param>
Ember<T>& operator = (const Ember<T>& ember)
{
if (this != &ember)

11
Source/EmberCL/EmberCLPch.h
View File

@ -23,8 +23,15 @@
#include <utility>
#ifdef NVIDIA
#undef CL_VERSION_1_2
#define CL_VERSION_1_1
#ifdef CL_VERSION_1_2
#undef CL_VERSION_1_2
#endif
#if !defined(WIN32) && !defined(_WIN32)
#ifndef CL_VERSION_1_1
#define CL_VERSION_1_1
#endif
#endif
#endif
#include <CL/cl.hpp>

2
Source/Fractorium/FractoriumRender.cpp
View File

@ -434,8 +434,8 @@ bool FractoriumEmberController<T>::Render()
if (iterBegin || ProcessState() == ACCUM_DONE)
{
if (m_FinalImage[m_FinalImageIndex].size() == m_Renderer->FinalBufferSize())//Make absolutely sure the correct amount of data is passed.
//gl->repaint();
gl->update();
//gl->repaint();
//m_Fractorium->update();
//m_Fractorium->ui.GLParentScrollArea->update();

1
Source/Fractorium/GLWidget.cpp
View File

@ -251,7 +251,6 @@ void GLWidget::paintGL()
glDisable(GL_LINE_SMOOTH);
glDisable(GL_POINT_SMOOTH);
glFinish();
m_Drawing = false;
}
}