summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
123efe5)
If a client application exits abruptly while in direct
rendering mode, the surface buffer could reference a null buffer.
We now check for this before attempting to use such a surface
buffer. It is also possible for WaylandSurfaceNode::preprocess to
be called after WaylandSurfaceItem has called surfaceDestroyed, so
now we check for a valid surface in preprocess as well.
Change-Id: Ibca71349b7a24687944f8b6cd505941b580e0c2a
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
{
QMutexLocker locker(WaylandSurfaceItem::mutex);
{
QMutexLocker locker(WaylandSurfaceItem::mutex);
- //Update if the item is dirty and we haven't done an updateTexture for this frame
- if (m_item && m_item->m_damaged && !m_textureUpdated) {
- m_item->updateTexture();
- updateTexture();
+ if (m_item && m_item->surface()) {
+ //Update if the item is dirty and we haven't done an updateTexture for this frame
+ if (m_item->m_damaged && !m_textureUpdated) {
+ m_item->updateTexture();
+ updateTexture();
+ }
}
//Reset value for next frame: we have not done updatePaintNode yet
m_textureUpdated = false;
}
//Reset value for next frame: we have not done updatePaintNode yet
m_textureUpdated = false;
bool Surface::postBuffer() {
#ifdef QT_COMPOSITOR_WAYLAND_GL
if (m_waylandSurface->handle() == m_compositor->directRenderSurface()) {
bool Surface::postBuffer() {
#ifdef QT_COMPOSITOR_WAYLAND_GL
if (m_waylandSurface->handle() == m_compositor->directRenderSurface()) {
- SurfaceBuffer *surfaceBuffer = m_backBuffer? m_backBuffer : m_frontBuffer;
- if (surfaceBuffer && m_compositor->pageFlipper()) {
- if (m_compositor->pageFlipper()->displayBuffer(surfaceBuffer)) {
- surfaceBuffer->setPageFlipperHasBuffer(true);
- m_compositor->setDirectRenderingActive(true);
- return true;
- } else {
- qDebug() << "could not post buffer";
+ SurfaceBuffer *surfaceBuffer = currentSurfaceBuffer();
+ if (surfaceBuffer && surfaceBuffer->waylandBufferHandle()) {
+ if (m_compositor->pageFlipper()) {
+ if (m_compositor->pageFlipper()->displayBuffer(surfaceBuffer)) {
+ surfaceBuffer->setPageFlipperHasBuffer(true);
+ m_compositor->setDirectRenderingActive(true);
+ return true;
+ } else {
+ qDebug() << "could not post buffer";
+ }
void *SurfaceBuffer::handle() const
{
void *SurfaceBuffer::handle() const
{
+ if (!m_buffer)
+ return 0;
+
if (!m_handle) {
SurfaceBuffer *that = const_cast<SurfaceBuffer *>(this);
if (isShmBuffer()) {
if (!m_handle) {
SurfaceBuffer *that = const_cast<SurfaceBuffer *>(this);
if (isShmBuffer()) {