From: Timo Lotterbach Date: Mon, 5 Dec 2011 14:39:09 +0000 (+0100) Subject: fixed broken build in texture binders caused by surface interface changes. X-Git-Tag: ivi-layer-management_version_0_9_5_rc~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16391638bace1568763317f10b7ed51b032b9fcb;p=profile%2Fivi%2Flayer-management.git fixed broken build in texture binders caused by surface interface changes. --- diff --git a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLX.cpp b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLX.cpp index 272d3d5..e671291 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLX.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLX.cpp @@ -34,9 +34,9 @@ bool X11CopyGLX::bindSurfaceTexture(Surface* surface) { nativeSurface = (XPlatformSurface*)surface->platform; } - if( nativeSurface != NULL && surface->nativeHandle != 0 ) + if( nativeSurface != NULL && surface->getNativeContent() != 0 ) { - pixmap = XCompositeNameWindowPixmap (dpy, surface->nativeHandle); + pixmap = XCompositeNameWindowPixmap (dpy, surface->getNativeContent()); if (!pixmap) { LOG_ERROR("X11CopyGLX", "didnt create pixmap!"); diff --git a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11TextureFromPixmap.cpp b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11TextureFromPixmap.cpp index 058019e..1e11eab 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11TextureFromPixmap.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11TextureFromPixmap.cpp @@ -67,13 +67,13 @@ bool X11TextureFromPixmap::unbindSurfaceTexture(Surface* surface) } void X11TextureFromPixmap::createClientBuffer(Surface* surface){ - LOG_DEBUG("X11TextureFromPixmap", "creating clientBuffer for window: " << surface->nativeHandle); + LOG_DEBUG("X11TextureFromPixmap", "creating clientBuffer for window: " << surface->getNativeContent()); GLXPlatformSurface* platformSurface = (GLXPlatformSurface*)surface->platform; if (NULL!=platformSurface) { Pixmap pixmap = 0; LOG_DEBUG("X11TextureFromPixmap", "get X Pixmap"); - pixmap= XCompositeNameWindowPixmap (dpy, surface->nativeHandle); + pixmap= XCompositeNameWindowPixmap (dpy, surface->getNativeContent()); if (pixmap==0) { LOG_ERROR("X11TextureFromPixmap", "didnt create pixmap!");