Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
2a81d291
Commit
2a81d291
authored
Mar 14, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(src/components/camera/MSFunctions): better asserts
parent
cbc8c720
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+1
-1
MSFunctions.hpp
linphone-desktop/src/components/camera/MSFunctions.hpp
+9
-4
No files found.
linphone-desktop/src/components/camera/Camera.cpp
View file @
2a81d291
...
...
@@ -29,7 +29,7 @@
#include <QFileInfo>
#include <QQuickWindow>
// =============================================================================
// =============================================================================
struct
CameraStateBinder
{
CameraStateBinder
(
CameraRenderer
*
renderer
)
:
m_renderer
(
renderer
)
{
...
...
linphone-desktop/src/components/camera/MSFunctions.hpp
View file @
2a81d291
...
...
@@ -25,12 +25,16 @@
#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) \
Q_ASSERT(QOpenGLContext::currentContext()->functions() == m_instance->m_q_functions && m_instance->m_q_functions != NULL);
\
GL_ASSERT()
\
m_instance->m_q_functions->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;
// =============================================================================
...
...
@@ -42,11 +46,11 @@ public:
~
MSFunctions
();
void
bind
(
QOpenGLFunctions
*
f
)
{
m_q_functions
=
f
;
m_q_functions
=
f
;
// Qt functions.
}
OpenGlFunctions
*
getFunctions
()
{
return
m_functions
;
return
m_functions
;
// Own implementation.
}
// ---------------------------------------------------------------------------
...
...
@@ -217,5 +221,6 @@ private:
#undef GL_CALL
#undef GL_CALL_RET
#undef GL_ASSERT
#endif // MS_FUNCTIONS_H_
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment