From dbaff017ebe9d429c4399609ece5198d8db1ae42 Mon Sep 17 00:00:00 2001 From: kallaballa Date: Wed, 9 Nov 2022 01:54:26 +0100 Subject: [PATCH] downgrade required opencl to 1.2 --- src/nanovg/nanovg-demo.cpp | 2 +- src/optflow/optflow-demo.cpp | 12 +++++------- src/optflow_mt/optflow_mt-demo.cpp | 2 +- src/tetra/tetra-demo.cpp | 2 +- src/video/video-demo.cpp | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/nanovg/nanovg-demo.cpp b/src/nanovg/nanovg-demo.cpp index b3157a050..910bd5f5e 100644 --- a/src/nanovg/nanovg-demo.cpp +++ b/src/nanovg/nanovg-demo.cpp @@ -1,4 +1,4 @@ -#define CL_TARGET_OPENCL_VERSION 200 +#define CL_TARGET_OPENCL_VERSION 120 constexpr unsigned long WIDTH = 1920; constexpr unsigned long HEIGHT = 1080; diff --git a/src/optflow/optflow-demo.cpp b/src/optflow/optflow-demo.cpp index e2fc6217b..a36915f30 100644 --- a/src/optflow/optflow-demo.cpp +++ b/src/optflow/optflow-demo.cpp @@ -1,4 +1,4 @@ -#define CL_TARGET_OPENCL_VERSION 200 +#define CL_TARGET_OPENCL_VERSION 120 constexpr unsigned long WIDTH = 1920; constexpr unsigned long HEIGHT = 1080; @@ -59,7 +59,7 @@ int main(int argc, char **argv) { cv::UMat frameBuffer; cv::UMat background; cv::UMat foreground(HEIGHT, WIDTH, CV_8UC4, cv::Scalar::all(0)); - cv::UMat videoFrame, flipped, nextVideoFrameGray, prevVideoFrameGray, foregroundMaskGrey; + cv::UMat videoFrame, nextVideoFrameGray, prevVideoFrameGray, foregroundMaskGrey; cv::Ptr bgSubtractor = cv::createBackgroundSubtractorMOG2(100, 32.0, false); @@ -78,14 +78,9 @@ int main(int argc, char **argv) { if (videoFrame.empty()) break; - gl::bind(); - gl::acquire_from_gl(frameBuffer); - cv::resize(videoFrame, videoFrame, cv::Size(WIDTH, HEIGHT)); cv::cvtColor(videoFrame, background, cv::COLOR_RGB2BGRA); cvtColor(videoFrame, nextVideoFrameGray, cv::COLOR_RGB2GRAY); - frameBuffer = cv::Scalar::all(0); - gl::release_to_gl(frameBuffer); bgSubtractor->apply(videoFrame, foregroundMaskGrey); @@ -102,6 +97,8 @@ int main(int argc, char **argv) { } } + gl::bind(); + if (allPoints.size() > 4) { prevPoints = allPoints; if (prevVideoFrameGray.empty()) { @@ -114,6 +111,7 @@ int main(int argc, char **argv) { cv::calcOpticalFlowPyrLK(prevVideoFrameGray, nextVideoFrameGray, prevPoints, nextPoints, status, err, cv::Size(15, 15), 2, criteria); nvg::begin(); + nvg::clear(); newPoints.clear(); using kb::nvg::vg; diff --git a/src/optflow_mt/optflow_mt-demo.cpp b/src/optflow_mt/optflow_mt-demo.cpp index daac034d2..fefe6f4b2 100644 --- a/src/optflow_mt/optflow_mt-demo.cpp +++ b/src/optflow_mt/optflow_mt-demo.cpp @@ -1,4 +1,4 @@ -#define CL_TARGET_OPENCL_VERSION 200 +#define CL_TARGET_OPENCL_VERSION 120 constexpr unsigned long WIDTH = 1920; constexpr unsigned long HEIGHT = 1080; diff --git a/src/tetra/tetra-demo.cpp b/src/tetra/tetra-demo.cpp index 762275c67..ad6aed5df 100644 --- a/src/tetra/tetra-demo.cpp +++ b/src/tetra/tetra-demo.cpp @@ -1,4 +1,4 @@ -#define CL_TARGET_OPENCL_VERSION 200 +#define CL_TARGET_OPENCL_VERSION 120 constexpr long unsigned int WIDTH = 1920; constexpr long unsigned int HEIGHT = 1080; diff --git a/src/video/video-demo.cpp b/src/video/video-demo.cpp index 9dc98eb02..8928025e8 100644 --- a/src/video/video-demo.cpp +++ b/src/video/video-demo.cpp @@ -1,4 +1,4 @@ -#define CL_TARGET_OPENCL_VERSION 200 +#define CL_TARGET_OPENCL_VERSION 120 //WIDTH and HEIGHT have to be specified before including subsystems.hpp constexpr long unsigned int WIDTH = 1920;