Set stereo view mode to Ecore_X_Atom

Write view mode to Ecore_X_Atom "_E_COMP_3D_APP_WIN" if it exists.

Change-Id: Id30bff408da3d73646f6ac27e9a4871106105936
Signed-off-by: Javon Prince <javon.prince@samsung.com>

diff --git a/adaptors/tizen/internal/common/adaptor-impl.cpp b/adaptors/tizen/internal/common/adaptor-impl.cpp
index 1bbdb40..ec781ec 100644 (file)
--- a/adaptors/tizen/internal/common/adaptor-impl.cpp
+++ b/adaptors/tizen/internal/common/adaptor-impl.cpp
@@ -761,6 +761,7 @@ Adaptor::Adaptor(Dali::Adaptor& adaptor, RenderSurface* surface, const DeviceLay
 
 void Adaptor::SetViewMode( ViewMode viewMode )
 {
+  mSurface->SetViewMode( viewMode );
   mCore->SetViewMode( viewMode );
 }
 

diff --git a/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.cpp b/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.cpp
index cbc587e..24c21cc 100644 (file)
--- a/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.cpp
+++ b/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.cpp
@@ -250,6 +250,10 @@ void RenderSurface::StopRender()
   mIsStopped = true;
 }
 
+void RenderSurface::SetViewMode( ViewMode )
+{
+}
+
 void RenderSurface::SetDisplay( Any display )
 {
   // the render surface can be passed either EFL e-core types, or x11 types

diff --git a/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.h b/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.h
index 9abe556..244f4b5 100644 (file)
--- a/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.h
+++ b/adaptors/tizen/internal/common/ecore-x/ecore-x-render-surface.h
@@ -182,6 +182,11 @@ public:  // from Internal::Adaptor::RenderSurface
   virtual void RenderSync();
 
   /**
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::SetViewMode()
+   */
+  void SetViewMode( ViewMode );
+
+  /**
    * @copydoc Dali::Internal::Adaptor::RenderSurface::PreRender()
    */
   virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction ) = 0;

diff --git a/adaptors/tizen/internal/common/ecore-x/window-render-surface.cpp b/adaptors/tizen/internal/common/ecore-x/window-render-surface.cpp
index 6b28931..d0c8765 100644 (file)
--- a/adaptors/tizen/internal/common/ecore-x/window-render-surface.cpp
+++ b/adaptors/tizen/internal/common/ecore-x/window-render-surface.cpp
@@ -217,6 +217,17 @@ void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstract
   }
 }
 
+void WindowRenderSurface::SetViewMode( ViewMode viewMode )
+{
+  Ecore_X_Atom viewModeAtom( ecore_x_atom_get( "_E_COMP_3D_APP_WIN" ) );
+
+  if( viewModeAtom != None )
+  {
+    unsigned int value( static_cast<unsigned int>( viewMode ) );
+    ecore_x_window_prop_card32_set( mX11Window, viewModeAtom, &value, 1 );
+  }
+}
+
 void WindowRenderSurface::CreateXRenderable()
 {
    // if width or height are zero, go full screen.

diff --git a/adaptors/tizen/internal/common/ecore-x/window-render-surface.h b/adaptors/tizen/internal/common/ecore-x/window-render-surface.h
index b544987..26df482 100644 (file)
--- a/adaptors/tizen/internal/common/ecore-x/window-render-surface.h
+++ b/adaptors/tizen/internal/common/ecore-x/window-render-surface.h
@@ -131,6 +131,11 @@ public:  // from Internal::Adaptor::RenderSurface
    */
   virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, unsigned int timeDelta, SyncMode syncMode );
 
+  /**
+   * @copydoc Dali::Internal::Adaptor::RenderSurface::SetViewMode()
+   */
+  void SetViewMode( ViewMode viewMode );
+
 protected:
 
   /**

diff --git a/adaptors/tizen/internal/common/render-surface-impl.h b/adaptors/tizen/internal/common/render-surface-impl.h
index 0edc227..bef71c0 100644 (file)
--- a/adaptors/tizen/internal/common/render-surface-impl.h
+++ b/adaptors/tizen/internal/common/render-surface-impl.h
@@ -20,6 +20,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/common/render-surface.h>
 #include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/view-mode.h>
 
 namespace Dali
 {
@@ -121,6 +122,12 @@ public: // API
   virtual void ConsumeEvents() = 0;
 
   /**
+   * Set the stereoscopic 3D view mode
+   * @param[in] viewMode The new view mode
+   */
+  virtual void SetViewMode( ViewMode viewMode ) = 0;
+
+  /**
    * Called after offscreen is posted to onscreen
    */
   virtual void RenderSync() = 0;