diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-03-12 14:32:34 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-03-16 13:00:43 +0000 |
| commit | d109e6dd5d6a18e715b979f3d3ef845946b1b787 (patch) | |
| tree | 5aeb69dc83efbf4d4b02f8c84a8795b3daa0d4b9 /examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro | |
| parent | 2099a8c3c77eea56b95a60e12f265b4eb1d8913d (diff) | |
Improvide device selection in the video filter example
The non-OS X path also uses clGetGLContextInfoKHR when available,
instead of just blindly taking the first GPU device for the platform.
This way we get the correct OpenCL device in case the application is using an
OpenGL context on the same vendor's second GPU.
On Windows desktop OpenGL is now correctly forced and therefore there is
no need to waste time on runtime checks for ANGLE later on.
Remove the hard-coded custom pathes from the .pro file.
Also fixes error reporting on the OS X specific path.
Change-Id: I8d6ab867510d113d5135b61e66822381e81c995a
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro')
| -rw-r--r-- | examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro b/examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro index c83929f72..f7f191d2b 100644 --- a/examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro +++ b/examples/multimedia/video/qmlvideofilter_opencl/qmlvideofilter_opencl.pro @@ -14,9 +14,4 @@ INSTALLS += target osx: LIBS += -framework OpenCL unix: !osx: LIBS += -lOpenCL -win32:!winrt { - # Edit these as necessary - INCLUDEPATH += c:/cuda/include - LIBPATH += c:/cuda/lib/x64 - LIBS += -lopengl32 -lOpenCL -} +win32:!winrt: LIBS += -lopengl32 -lOpenCL |