From 0d81b93c8863ec535a18f332f55afdc838255cda Mon Sep 17 00:00:00 2001 From: kallaballa Date: Sat, 8 Oct 2022 07:32:46 +0200 Subject: [PATCH] renaming --- src/tetra/subsystems.hpp | 17 +++++++++-------- src/tetra/tetra-demo.cpp | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/tetra/subsystems.hpp b/src/tetra/subsystems.hpp index ad6a6aa7d..839f6c5ed 100644 --- a/src/tetra/subsystems.hpp +++ b/src/tetra/subsystems.hpp @@ -377,14 +377,6 @@ void swapBuffers() { kb::egl::swapBuffers(); } -void fetch_frame_buffer(cv::UMat &m) { - glCheck(cv::ogl::convertFromGLTexture2D(*frame_buf_tex, m)); -} - -void return_frame_buffer(cv::UMat &m) { - glCheck(cv::ogl::convertToGLTexture2D(m, *frame_buf_tex)); -} - std::string get_info() { return reinterpret_cast(glGetString(GL_VERSION)); } @@ -393,6 +385,15 @@ std::string get_info() { namespace kb { namespace cl { + +void fetch_frame_buffer(cv::UMat &m) { + glCheck(cv::ogl::convertFromGLTexture2D(*gl::frame_buf_tex, m)); +} + +void return_frame_buffer(cv::UMat &m) { + glCheck(cv::ogl::convertToGLTexture2D(m, *gl::frame_buf_tex)); +} + std::string get_info() { std::stringstream ss; std::vector plt_info; diff --git a/src/tetra/tetra-demo.cpp b/src/tetra/tetra-demo.cpp index 487a0d49c..3022f9a62 100644 --- a/src/tetra/tetra-demo.cpp +++ b/src/tetra/tetra-demo.cpp @@ -72,7 +72,7 @@ int main(int argc, char **argv) { glFlush(); gl::swapBuffers(); - gl::fetch_frame_buffer(frameBuffer); //hand over the data (GPU 2 GPU) to OpenCV/OpenCL + cl::fetch_frame_buffer(frameBuffer); //hand over the data (GPU 2 GPU) to OpenCV/OpenCL //Using OpenCL in the background cv::flip(frameBuffer, frameBuffer, 0); // flip the image in the y-axis