Commit 2a81d291 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(src/components/camera/MSFunctions): better asserts

parent cbc8c720
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QQuickWindow> #include <QQuickWindow>
// ============================================================================= // =============================================================================
struct CameraStateBinder { struct CameraStateBinder {
CameraStateBinder (CameraRenderer *renderer) : m_renderer(renderer) { CameraStateBinder (CameraRenderer *renderer) : m_renderer(renderer) {
......
...@@ -25,12 +25,16 @@ ...@@ -25,12 +25,16 @@
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
#define GL_ASSERT() \
Q_ASSERT(m_instance->m_q_functions != NULL); \
Q_ASSERT(QOpenGLContext::currentContext()->functions() == m_instance->m_q_functions);
#define GL_CALL(CALL) \ #define GL_CALL(CALL) \
Q_ASSERT(QOpenGLContext::currentContext()->functions() == m_instance->m_q_functions && m_instance->m_q_functions != NULL); \ GL_ASSERT() \
m_instance->m_q_functions->CALL; m_instance->m_q_functions->CALL;
#define GL_CALL_RET(CALL) \ #define GL_CALL_RET(CALL) \
Q_ASSERT(QOpenGLContext::currentContext()->functions() == m_instance->m_q_functions && m_instance->m_q_functions != NULL); \ GL_ASSERT() \
return m_instance->m_q_functions->CALL; return m_instance->m_q_functions->CALL;
// ============================================================================= // =============================================================================
...@@ -42,11 +46,11 @@ public: ...@@ -42,11 +46,11 @@ public:
~MSFunctions (); ~MSFunctions ();
void bind (QOpenGLFunctions *f) { void bind (QOpenGLFunctions *f) {
m_q_functions = f; m_q_functions = f; // Qt functions.
} }
OpenGlFunctions *getFunctions () { OpenGlFunctions *getFunctions () {
return m_functions; return m_functions; // Own implementation.
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
...@@ -217,5 +221,6 @@ private: ...@@ -217,5 +221,6 @@ private:
#undef GL_CALL #undef GL_CALL
#undef GL_CALL_RET #undef GL_CALL_RET
#undef GL_ASSERT
#endif // MS_FUNCTIONS_H_ #endif // MS_FUNCTIONS_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment