Additional changes to work with Simon's pull request.

-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

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>