diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-07-01 09:44:46 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-11 12:13:30 +0000 |
| commit | 48e241740974ca1b8ba7d654958c423ca9ec9e0e (patch) | |
| tree | baa3a2a0aac05ff3a8a8b54be8a22f1e7d943a80 /examples | |
| parent | 839f40ccf522bef3ed4b499899a23393a9a8a1aa (diff) | |
| download | qtwayland-48e241740974ca1b8ba7d654958c423ca9ec9e0e.tar.gz | |
Compositor: Rename shm to sharedMemory
sharedMemory is much clearer and will increase the readability of the code and
API.
Change-Id: Ibb6d7424fa8d44a94a0f4ddf476a564eb235323f
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp index ebbb5e47..4c1fae23 100644 --- a/examples/wayland/qwindow-compositor/windowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp @@ -72,7 +72,7 @@ GLuint WindowCompositorView::getTexture(GLenum *target) if (streamingTexture) m_texture = streamingTexture; - if (!buf.isShm() && buf.bufferFormatEgl() == QWaylandBufferRef::BufferFormatEgl_EXTERNAL_OES) + if (!buf.isSharedMemory() && buf.bufferFormatEgl() == QWaylandBufferRef::BufferFormatEgl_EXTERNAL_OES) m_textureTarget = GL_TEXTURE_EXTERNAL_OES; if (advance()) { @@ -81,7 +81,7 @@ GLuint WindowCompositorView::getTexture(GLenum *target) glGenTextures(1, &m_texture); glBindTexture(m_textureTarget, m_texture); - if (buf.isShm()) + if (buf.isSharedMemory()) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); buf.bindToTexture(); } |