summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2014-01-07 09:20:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-09 12:25:11 +0100
commit3323630585ea40842db42ad64ad45fe5b465a5b8 (patch)
treee0a11de2279210ff22f57799e576e2f069cbeba0 /src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
parent10700eb19191879caf41bc188dca807b68a4146c (diff)
Adjust the serverbufferintegrations to use bind texture api
It mapps closer to the underlying OpenGL architecture Change-Id: I4e0dca4d54670846488c86df2a0fa0c58d49734d Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp')
-rw-r--r--src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
index d43fc70b4..9c7440dc6 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp
@@ -102,25 +102,19 @@ struct ::wl_resource *DrmEglServerBuffer::resourceForClient(struct ::wl_client *
return (*it)->handle;
}
-GLuint DrmEglServerBuffer::createTexture()
+void DrmEglServerBuffer::bindTextureToBuffer()
{
if (!QOpenGLContext::currentContext()) {
qWarning("DrmEglServerBuffer: No current context when creating buffer. Texture loading will fail");
- return 0;
+ return;
}
- GLuint texture;
- glGenTextures(1, &texture);
- glBindTexture(GL_TEXTURE_2D, texture);
-
m_integration->glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, m_image);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- return texture;
}
DrmEglServerBufferIntegration::DrmEglServerBufferIntegration()