From 1b95d3331cb43fda36f92189ddce4e4c45bd47ea Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Thu, 29 Nov 2012 16:42:11 -0200 Subject: [PATCH] QNX: Move buffer count check to appropriate location The buffer count check should take place right after buffers are created. For some reason, the buffer count value inside libscreen may become incosistent during the course of the program. Change-Id: Icbbaf4734eac5b0c5c95bdd93771899f9fcdb7db Reviewed-by: Kevin Krammer Reviewed-by: Thomas McGuire Reviewed-by: Nicolas Arnaud-Cormos --- src/plugins/platforms/qnx/qqnxwindow.cpp | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 166cb499b0..e4505c6c60 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -358,6 +358,19 @@ void QQnxWindow::setBufferSize(const QSize &size) if (result != 0) { qFatal("QQnxWindow: failed to create window buffers, errno=%d", errno); } + + // check if there are any buffers available + int bufferCount = 0; + result = screen_get_window_property_iv(m_window, SCREEN_PROPERTY_RENDER_BUFFER_COUNT, &bufferCount); + + if (result != 0) { + qFatal("QQnxWindow: failed to query window buffer count, errno=%d", errno); + } + + if (bufferCount != MAX_BUFFER_COUNT) { + qFatal("QQnxWindow: invalid buffer count. Expected = %d, got = %d. You might experience problems.", + MAX_BUFFER_COUNT, bufferCount); + } } // Cache new buffer size @@ -378,22 +391,10 @@ QQnxBuffer &QQnxWindow::renderBuffer() // Check if render buffer is invalid if (m_currentBufferIndex == -1) { - // check if there are any buffers available - int bufferCount = 0; - int result = screen_get_window_property_iv(m_window, SCREEN_PROPERTY_RENDER_BUFFER_COUNT, &bufferCount); - - if (result != 0) { - qFatal("QQnxWindow: failed to query window buffer count, errno=%d", errno); - } - - if (bufferCount != MAX_BUFFER_COUNT) { - qFatal("QQnxWindow: invalid buffer count. Expected = %d, got = %d", MAX_BUFFER_COUNT, bufferCount); - } - // Get all buffers available for rendering errno = 0; screen_buffer_t buffers[MAX_BUFFER_COUNT]; - result = screen_get_window_property_pv(m_window, SCREEN_PROPERTY_RENDER_BUFFERS, (void **)buffers); + const int result = screen_get_window_property_pv(m_window, SCREEN_PROPERTY_RENDER_BUFFERS, (void **)buffers); if (result != 0) { qFatal("QQnxWindow: failed to query window buffers, errno=%d", errno); }