Merge lp:~unity-team/nux/nux.depth-texture-detection-support into lp:nux

[Jay Taoko]

* Added depth texture support detection.
* Disable use of depth textures if support not available.

* Added depth texture support detection.
* Disable use of depth textures if support not available.

[lp:~unity-team/nux/nux.depth-texture-detection-support]

709. By MC Return on 2012-11-18

Performance:
Check for emptiness instead of calculating the size as this might be inefficient.
xxxx.size() can take linear time while xxxx.empty() is guaranteed to take constant time.

Approved by Michi Henning.

710. By MC Return on 2012-11-18

Performance: Do not create unnecessary string copies by converting const char* to std::string, instead use those directly.

Approved by Michi Henning.

711. By Michael Terry on 2012-11-19

Enable headless tests during build.

Approved by Didier Roche.

712. By Brandon Schaefer on 2012-11-20

Adds a input area proximity class which takes an input area and the proximity.

It has 3 signals, mouse_near, mouse_approaching, and mouse_beyond. They depend on the CheckMousePosition function. The default function expands each side of the InputArea by the proximity and checks if the mouse is within that geo. If true then emit mouse_near, if the mouse then is moved from that geo mouse_beyond will emit. (Some what like enter/leave). If the mouse is near, but not yet inside the input area then the mouse_approaching signal emits the mouses position and the distance to the input area. Fixes: https://bugs.launchpad.net/bugs/608124.

Approved by Jay Taoko, Marco Trevisan (Treviño).

[Tim Penhey (thumper)]

Looks ok to me.

review: Approve

[lp:~unity-team/nux/nux.depth-texture-detection-support]

713. By Tim Penhey on 2012-11-21

- Introducing improvements for ARM build.
- Resolved build failures
- Added --enable-x-support option
- Added --enable-minimal-build option

[Tests] Covered by existing tests.

Approved by Brandon Schaefer, Jay Taoko.

714. By Ricardo Salveti on 2012-11-21

 make check-headless should respect DEB_BUILD_OPTIONS=nocheck
.

Approved by Didier Roche.

715. By Brandon Schaefer on 2012-11-22

Check the position of mouse events for InputAreaProximities if an event type is NUX_WINDOW_MOUSE_LEAVE.

Approved by Jay Taoko.

716. By Tim Penhey on 2012-11-22

Make tests/gtest-nuxcore only depend on NuxCore libs.

Approved by Brandon Schaefer.

717. By Michi Henning on 2012-11-23

Fixes random color generation (which left the green component always at zero) in RandomColorINT().

Approved by Michi Henning.

718. By Albert Astals Cid on 2012-11-23

Make GetPosition const.

Approved by Marco Trevisan (Treviño), Neil J. Patel.

719. By Michi Henning on 2012-11-24

Added unit test for RandomColor().

Approved by .

720. By Brandon Schaefer on 2012-11-24

Fixes multi monitor issue with input area prox.

Approved by Andrea Azzarone.

721. By Marco Trevisan (Treviño) on 2012-11-27

AnimationValue: add Reverse and CurrentTimePosition methods

The first allow to revert the "direction" of an animation, while the second returns the current elapsed time since the animation has started.

Approved by Tim Penhey.

722. By Daniel d'Andrada on 2012-11-27

Fix build when geis is located outside /usr.

Approved by Stephen M. Webb.

723. By Jay Taoko on 2012-11-27

* Merged with lp:nux

724. By Jay Taoko on 2012-11-28

* Fixed ARM build error [-Werror=unused-but-set-variable]

[Sean Feole (sfeole)]

Last night I successfully installed and tested nux4.0 and unity 6.12 built by Lucasz (sil2100) in the unity-team/ppa targeted for Quantal. All of the packages appeared to work as expected.

If Jay is rebasing this patch to the nux trunk and I would be happy to retest once that finishes.

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-11-22 00:48:56 +0000
+++ Nux/WindowCompositor.cpp	2012-11-28 15:20:28 +0000
@@ -61,6 +61,8 @@
     on_menu_closure_continue_with_event_ = false;
     _mouse_position_on_owner = Point(0, 0);
 
+    platform_support_for_depth_texture_ = GetGraphicsDisplay()->GetGpuDevice()->GetGpuInfo().Support_Depth_Buffer();
+
     m_FrameBufferObject = GetGraphicsDisplay()->GetGpuDevice()->CreateFrameBufferObject();
     // Do not leave the Fbo binded. Deactivate it.
     m_FrameBufferObject->Deactivate();
@@ -68,7 +70,11 @@
     // At this stage, the size of the window may not be known yet.
     // FormatRenderTargets will be called the first time runtime gets into WindowThread::ExecutionLoop
     m_MainColorRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
-    m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+
+    if (platform_support_for_depth_texture_)
+    {
+      m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+    }
 
 #if !defined(NUX_MINIMAL)
     _mouse_over_menu_page       = NULL;
@@ -1625,10 +1631,17 @@
     buffer_width = window_thread_->GetGraphicsEngine().GetWindowWidth();
     buffer_height = window_thread_->GetGraphicsEngine().GetWindowHeight();
 
-    if ((!m_MainColorRT.IsValid()) || (!m_MainDepthRT.IsValid()) || (m_MainColorRT->GetWidth() != buffer_width) || (m_MainColorRT->GetHeight() != buffer_height))
+    if ((!m_MainColorRT.IsValid()) || (m_MainColorRT->GetWidth() != buffer_width) || (m_MainColorRT->GetHeight() != buffer_height))
     {
       m_MainColorRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
-      m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+    }
+
+    if (platform_support_for_depth_texture_)
+    {
+      if ((!m_MainDepthRT.IsValid()) || (m_MainDepthRT->GetWidth() != buffer_width) || (m_MainDepthRT->GetHeight() != buffer_height))
+      {
+        m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+      }
     }
 
     m_FrameBufferObject->FormatFrameBufferObject(buffer_width, buffer_height, BITFMT_R8G8B8A8);
@@ -2050,7 +2063,10 @@
     nuxAssert(buffer_height >= 1);
 
     m_MainColorRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
-    m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+    if (platform_support_for_depth_texture_)
+    {
+      m_MainDepthRT = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+    }
 
     // Clear the buffer the first time...
     m_FrameBufferObject->FormatFrameBufferObject(buffer_width, buffer_height, BITFMT_R8G8B8A8);
@@ -2093,7 +2109,14 @@
       if ((rt.color_rt->GetWidth() != buffer_width) || (rt.color_rt->GetHeight() != buffer_height))
       {
         rt.color_rt = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
-        rt.depth_rt = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+      }
+
+      if (platform_support_for_depth_texture_)
+      {
+        if ((rt.depth_rt->GetWidth() != buffer_width) || (rt.depth_rt->GetHeight() != buffer_height))
+        {
+          rt.depth_rt = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(buffer_width, buffer_height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);
+        }
       }
 
       m_FrameBufferObject->FormatFrameBufferObject(buffer_width, buffer_height, BITFMT_R8G8B8A8);
 
=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-11-20 22:13:38 +0000
+++ Nux/WindowCompositor.h	2012-11-28 15:20:28 +0000
@@ -536,6 +536,9 @@
     unsigned int reference_fbo_;
     Geometry reference_fbo_geometry_;
 
+    //! True if the platform has support for depth textures.
+    bool platform_support_for_depth_texture_;
+
     //! Pointer grab stack.
     /*!
         The head of the list is the top of the stack.
 
=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2012-11-12 20:59:56 +0000
+++ NuxGraphics/GpuDevice.cpp	2012-11-28 15:20:28 +0000
@@ -187,26 +187,49 @@
   STREAMSOURCE GpuDevice::_StreamSource[MAX_NUM_STREAM];
 
   GpuInfo::GpuInfo()
-  : _opengl_max_texture_size(0)
-  , _opengl_max_texture_units(0)
-  , _opengl_max_texture_coords(0)
-  , _opengl_max_texture_image_units(0)
-  , _opengl_max_fb_attachment(0)
-  , _opengl_max_vertex_attributes(0)
+    : _support_opengl_version_11(false)
+    , _support_opengl_version_12(false)
+    , _support_opengl_version_13(false)
+    , _support_opengl_version_14(false)
+    , _support_opengl_version_15(false)
+    , _support_opengl_version_20(false)
+    , _support_opengl_version_21(false)
+    , _support_opengl_version_30(false)
+    , _support_opengl_version_31(false)
+    , _support_opengl_version_32(false)
+    , _support_opengl_version_33(false)
+    , _support_opengl_version_40(false)
+    , _support_opengl_version_41(false)
+    , _opengl_max_texture_size(0)
+    , _opengl_max_texture_units(0)
+    , _opengl_max_texture_coords(0)
+    , _opengl_max_texture_image_units(0)
+    , _opengl_max_fb_attachment(0)
+    , _opengl_max_vertex_attributes(0)
+    , _support_ext_swap_control(false)
+    , _support_arb_vertex_program(false)
+    , _support_arb_fragment_program(false)
+    , _support_arb_shader_objects(false)
+    , _support_arb_vertex_shader(false)
+    , _support_arb_fragment_shader(false)
+    , _support_arb_vertex_buffer_object(false)
+    , _support_arb_texture_non_power_of_two(false)
+    , _support_ext_framebuffer_object(false)
+    , _support_ext_draw_range_elements(false)
+    , _support_ext_stencil_two_side(false)
+    , _support_ext_texture_rectangle(false)
+    , _support_arb_texture_rectangle(false)
+    , _support_nv_texture_rectangle(false)
+    , _support_arb_pixel_buffer_object(false)
+    , _support_ext_blend_equation_separate(false)
+    , _support_depth_buffer(false)
+#ifndef NUX_OPENGLES_20
+    , _support_ext_texture_srgb(false)
+    , _support_ext_texture_srgb_decode(false)
+    , _support_ext_framebuffer_srgb(false)
+    , _support_arb_framebuffer_srgb(false)
+#endif
   {
-    _support_opengl_version_11 = false;
-    _support_opengl_version_12 = false;
-    _support_opengl_version_13 = false;
-    _support_opengl_version_14 = false;
-    _support_opengl_version_15 = false;
-    _support_opengl_version_20 = false;
-    _support_opengl_version_21 = false;
-    _support_opengl_version_30 = false;
-    _support_opengl_version_31 = false;
-    _support_opengl_version_32 = false;
-    _support_opengl_version_33 = false;
-    _support_opengl_version_40 = false;
-    _support_opengl_version_41 = false;
   }
 
   void GpuInfo::Setup()
@@ -234,6 +257,7 @@
     CHECKGL(glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &_opengl_max_texture_image_units));
     CHECKGL(glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &_opengl_max_vertex_attributes));
     CHECKGL(glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &_opengl_max_fb_attachment));
+    _support_depth_buffer = true;
 #else
     // By opengl es 2.0 standard, GL_MAX_TEXTURE_SIZE should return a minimum of 64.
     CHECKGL(glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_opengl_max_texture_size));
@@ -242,6 +266,11 @@
     CHECKGL(glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &_opengl_max_texture_image_units));
     // GL_MAX_COLOR_ATTACHMENTS_EXT is not supported under opengl es 2.0.
     _opengl_max_fb_attachment = 1;
+
+    if (glGetString(GL_OES_depth_texture))
+    {
+      _support_depth_buffer = true;
+    }
 #endif
 
 #if defined(NUX_OS_WINDOWS)
 
=== modified file 'NuxGraphics/GpuDevice.h'
--- NuxGraphics/GpuDevice.h	2012-11-12 20:59:56 +0000
+++ NuxGraphics/GpuDevice.h	2012-11-28 15:20:28 +0000
@@ -84,8 +84,8 @@
     bool SupportOpenGL21() const    {return _support_opengl_version_21;}
     bool SupportOpenGL30() const    {return _support_opengl_version_30;}
     bool SupportOpenGL31() const    {return _support_opengl_version_31;}
+    bool SupportOpenGL32() const    {return _support_opengl_version_32;}
     bool SupportOpenGL33() const    {return _support_opengl_version_33;}
-    bool SupportOpenGL32() const    {return _support_opengl_version_32;}
     bool SupportOpenGL40() const    {return _support_opengl_version_40;}
     bool SupportOpenGL41() const    {return _support_opengl_version_41;}
 
@@ -105,6 +105,7 @@
     bool Support_NV_Texture_Rectangle()          const    {return _support_nv_texture_rectangle;}
     bool Support_ARB_Pixel_Buffer_Object()       const    {return _support_arb_pixel_buffer_object;}
     bool Support_EXT_Blend_Equation_Separate()   const    {return _support_ext_blend_equation_separate;}
+    bool Support_Depth_Buffer()                  const    {return _support_depth_buffer;}
 
 #ifndef NUX_OPENGLES_20
     bool Support_EXT_Texture_sRGB()              const    {return _support_ext_texture_srgb;}
@@ -157,6 +158,7 @@
     bool _support_nv_texture_rectangle;
     bool _support_arb_pixel_buffer_object;
     bool _support_ext_blend_equation_separate;
+    bool _support_depth_buffer;
 
 #ifndef NUX_OPENGLES_20
     bool _support_ext_texture_srgb;
 
=== modified file 'NuxGraphics/GpuDeviceTexture.cpp'
--- NuxGraphics/GpuDeviceTexture.cpp	2012-11-05 21:31:06 +0000
+++ NuxGraphics/GpuDeviceTexture.cpp	2012-11-28 15:20:28 +0000
@@ -36,9 +36,15 @@
     int Width
     , int Height
     , int Levels
-    , BitmapFormat PixelFormat
+    , BitmapFormat pixel_format
     , NUX_FILE_LINE_DECL)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLTexture2D>();
+    }
+
     GpuInfo gpu_info = GetGpuInfo();
     int msz = gpu_info.GetMaxTextureSize();
     if(Width <= 0 || Height <= 0 || Width > msz || Height > msz)
@@ -63,7 +69,7 @@
     }
 
     ObjectPtr<IOpenGLTexture2D> result;
-    result.Adopt(new IOpenGLTexture2D(Width, Height, NumMipLevel, PixelFormat, false, NUX_FILE_LINE_PARAM));
+    result.Adopt(new IOpenGLTexture2D(Width, Height, NumMipLevel, pixel_format, false, NUX_FILE_LINE_PARAM));
     return result;
   }
 
@@ -74,6 +80,12 @@
     , BitmapFormat pixel_format
     , NUX_FILE_LINE_DECL)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLTexture2D>();
+    }
+
     GpuInfo gpu_info = GetGpuInfo();
     int msz = gpu_info.GetMaxTextureSize();
     if(width <= 0 || height <=0 || width > msz || height > msz)
@@ -90,9 +102,15 @@
     int Width
     , int Height
     , int Levels
-    , BitmapFormat PixelFormat
+    , BitmapFormat pixel_format
     , NUX_FILE_LINE_DECL)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLRectangleTexture>();
+    }
+
     GpuInfo gpu_info = GetGpuInfo();
     int msz = gpu_info.GetMaxTextureSize();
     if(Width <= 0 || Height <= 0 || Width > msz || Height > msz)
@@ -117,17 +135,23 @@
     }
 
     ObjectPtr<IOpenGLRectangleTexture> result;
-    result.Adopt(new IOpenGLRectangleTexture(Width, Height, NumMipLevel, PixelFormat, false, NUX_FILE_LINE_PARAM));
+    result.Adopt(new IOpenGLRectangleTexture(Width, Height, NumMipLevel, pixel_format, false, NUX_FILE_LINE_PARAM));
     return result;
   }
 
   ObjectPtr<IOpenGLCubeTexture> GpuDevice::CreateCubeTexture(
     int EdgeLength
     , int Levels
-    , BitmapFormat PixelFormat
+    , BitmapFormat pixel_format
     , const char * /* __Nux_FileName__ */
     , int /* __Nux_LineNumber__ */)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLCubeTexture>();
+    }
+
     unsigned int NumTotalMipLevel = 1 + floorf(Log2(EdgeLength));
     unsigned int NumMipLevel = 0;
 
@@ -145,7 +169,7 @@
     }
 
     ObjectPtr<IOpenGLCubeTexture> result;
-    result.Adopt(new IOpenGLCubeTexture(EdgeLength, NumMipLevel, PixelFormat));
+    result.Adopt(new IOpenGLCubeTexture(EdgeLength, NumMipLevel, pixel_format));
     return result;
   }
 
@@ -154,10 +178,16 @@
     , int Height
     , int Depth
     , int Levels
-    , BitmapFormat PixelFormat
+    , BitmapFormat pixel_format
     , const char * /* __Nux_FileName__ */
     , int /* __Nux_LineNumber__ */)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLVolumeTexture>();
+    }
+
     GpuInfo gpu_info = GetGpuInfo();
     int msz = gpu_info.GetMaxTextureSize();
     if(Width <= 0 || Height <= 0 || Width > msz || Height > msz)
@@ -182,7 +212,7 @@
     }
 
     ObjectPtr<IOpenGLVolumeTexture> result;
-    result.Adopt(new IOpenGLVolumeTexture(Width, Height, Depth, NumMipLevel, PixelFormat));
+    result.Adopt(new IOpenGLVolumeTexture(Width, Height, Depth, NumMipLevel, pixel_format));
     return result;
   }
 
@@ -190,8 +220,14 @@
     int Width
     , int Height
     , int Depth
-    , BitmapFormat PixelFormat)
+    , BitmapFormat pixel_format)
   {
+    if ((pixel_format == BITFMT_D24S8) && (!GetGpuInfo().Support_Depth_Buffer()))
+    {
+      // No support for depth buffers
+      return ObjectPtr<IOpenGLAnimatedTexture>();
+    }
+
     GpuInfo gpu_info = GetGpuInfo();
     int msz = gpu_info.GetMaxTextureSize();
     if(Width <= 0 || Height <= 0 || Width > msz || Height > msz)
@@ -200,7 +236,7 @@
     }
 
     ObjectPtr<IOpenGLAnimatedTexture> result;
-    result.Adopt(new IOpenGLAnimatedTexture(Width, Height, Depth, PixelFormat));
+    result.Adopt(new IOpenGLAnimatedTexture(Width, Height, Depth, pixel_format));
     return result;
   }
 
 
=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-11-20 22:13:38 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-11-28 15:20:28 +0000
@@ -195,21 +195,23 @@
     SetScissor(0, 0, _graphics_display.GetWindowWidth(), _graphics_display.GetWindowHeight());
     EnableScissoring(true);
 
+    GpuDevice* gpu_device = _graphics_display.GetGpuDevice();
+    const GpuInfo& gpu_info = gpu_device->GetGpuInfo();
+
     if (create_rendering_data)
     {
 #ifndef NUX_OPENGLES_20
       bool opengl_14_support = true;
-
-      if ((_graphics_display.GetGpuDevice()->GetOpenGLMajorVersion() == 1) &&
-        (_graphics_display.GetGpuDevice()->GetOpenGLMinorVersion() < 4))
+      if ((gpu_device->GetOpenGLMajorVersion() == 1) &&
+        (gpu_device->GetOpenGLMinorVersion() < 4))
       {
         // OpenGL version is less than OpenGL 1.4
         opengl_14_support = false;
       }
-            
-      if (_graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Fragment_Shader() &&
-        _graphics_display.GetGpuDevice()->GetGpuInfo().Support_ARB_Vertex_Program() &&
-        opengl_14_support)
+
+      if (gpu_info.Support_ARB_Fragment_Shader() &&
+          gpu_info.Support_ARB_Vertex_Program() &&
+          opengl_14_support)
       {
         InitAsmColorShader();
         InitAsmTextureShader();
@@ -229,8 +231,6 @@
       }
 #endif
 
-      const GpuInfo& gpu_info = _graphics_display.GetGpuDevice()->GetGpuInfo();
-
       if ((gpu_info.Support_ARB_Vertex_Program() && gpu_info.Support_ARB_Fragment_Program())
           || (gpu_info.Support_ARB_Vertex_Shader() && gpu_info.Support_ARB_Fragment_Shader()))
       {
@@ -238,7 +238,7 @@
       }
 
       if (gpu_info.Support_EXT_Framebuffer_Object())
-        _offscreen_fbo = _graphics_display.GetGpuDevice()->CreateFrameBufferObject();
+        _offscreen_fbo = gpu_device->CreateFrameBufferObject();
 
       _offscreen_color_rt0  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
       _offscreen_color_rt1  = _graphics_display.GetGpuDevice()->CreateTexture(2, 2, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
@@ -1312,7 +1312,10 @@
       colorbuffer = _graphics_display.GetGpuDevice()->CreateTexture(width, height, 1, BITFMT_R8G8B8A8, NUX_TRACKER_LOCATION);
     }
 
-    if ((depthbuffer.IsValid()) && ((depthbuffer->GetWidth() != width) || (depthbuffer->GetHeight() != height)))
+    bool use_depth_buffer = _graphics_display.GetGpuDevice()->GetGpuInfo().Support_Depth_Buffer();
+    if (use_depth_buffer &&
+        depthbuffer.IsValid() &&
+        ((depthbuffer->GetWidth() != width) || (depthbuffer->GetHeight() != height)))
     {
       // Generate a new depth texture only if a valid one was passed to this function.
       depthbuffer = _graphics_display.GetGpuDevice()->CreateTexture(width, height, 1, BITFMT_D24S8, NUX_TRACKER_LOCATION);      
@@ -1321,7 +1324,7 @@
     fbo->FormatFrameBufferObject(width, height, BITFMT_R8G8B8A8);
     fbo->SetRenderTarget(0, colorbuffer->GetSurfaceLevel(0));
     
-    if (depthbuffer.IsValid())
+    if (use_depth_buffer && depthbuffer.IsValid())
       fbo->SetDepthSurface(depthbuffer->GetSurfaceLevel(0));
     else
       fbo->SetDepthSurface(ObjectPtr<IOpenGLSurface>(NULL));
 
=== modified file 'NuxGraphics/IOpenGLFrameBufferObject.cpp'
--- NuxGraphics/IOpenGLFrameBufferObject.cpp	2012-11-17 21:44:54 +0000
+++ NuxGraphics/IOpenGLFrameBufferObject.cpp	2012-11-28 15:20:28 +0000
@@ -32,7 +32,8 @@
   NUX_IMPLEMENT_OBJECT_TYPE(IOpenGLFrameBufferObject);
 
   IOpenGLFrameBufferObject::IOpenGLFrameBufferObject(NUX_FILE_LINE_DECL)
-    :   IOpenGLResource(RTFRAMEBUFFEROBJECT, NUX_FILE_LINE_PARAM)
+  : IOpenGLResource(RTFRAMEBUFFEROBJECT, NUX_FILE_LINE_PARAM)
+  , platform_support_for_depth_texture_(false)
   {
     attachment_width_ = 1;
     attachment_height_ = 1;
@@ -45,6 +46,11 @@
       surface_attachment_array_.push_back(ObjectPtr<IOpenGLSurface> (0));
     }
 
+    if (GetGraphicsDisplay()->GetGpuDevice() && GetGraphicsDisplay()->GetGpuDevice()->GetGpuInfo().Support_Depth_Buffer())
+    {
+      platform_support_for_depth_texture_ = true;
+    }
+
     FormatFrameBufferObject(attachment_width_, attachment_height_, _PixelFormat);
     GRunTimeStats.Register(this);
   }
@@ -174,7 +180,10 @@
 
   int IOpenGLFrameBufferObject::SetDepthSurface(ObjectPtr<IOpenGLSurface> pDepthSurface)
   {
-    //nuxAssert(pDepthSurface.IsValid());
+    if (!platform_support_for_depth_texture_)
+    {
+      return 0;
+    }
 
     if (pDepthSurface.IsNull())
     {
@@ -208,6 +217,11 @@
 
   int IOpenGLFrameBufferObject::SetDepthTextureAttachment(ObjectPtr<IOpenGLBaseTexture> depth_texture, int mip_level)
   {
+    if (!platform_support_for_depth_texture_)
+    {
+      return 0;
+    }
+
     if (depth_texture.IsNull())
     {
       depth_surface_attachment_ = ObjectPtr<IOpenGLSurface> (0);
@@ -289,27 +303,26 @@
       }
     }
 
-    if (depth_surface_attachment_.IsValid())
+    if (platform_support_for_depth_texture_)
     {
-        GLenum target   = depth_surface_attachment_->GetSurfaceTarget();
-        GLenum glID     = depth_surface_attachment_->GetOpenGLID();
-        GLint level     = depth_surface_attachment_->GetMipLevel();
-        CHECKGL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, target, glID, level));
+      if (depth_surface_attachment_.IsValid())
+      {
+          GLenum target   = depth_surface_attachment_->GetSurfaceTarget();
+          GLenum glID     = depth_surface_attachment_->GetOpenGLID();
+          GLint level     = depth_surface_attachment_->GetMipLevel();
+          CHECKGL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, target, glID, level));
+      }
+      else
+      {
+          CHECKGL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0));
+          // On the PC you need to bing the same D24S8 surface to the depth and the stencil attachment.
+      }
     }
     else
     {
-        CHECKGL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0));
-        // On the PC you need to bing the same D24S8 surface to the depth and the stencil attachment.
+      CHECKGL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0));
     }
 
-// #ifndef NUX_OPENGLES_20
-//     _Rbo.Set(GL_DEPTH_COMPONENT, attachment_width_, attachment_height_);
-//     CHECKGL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
-//                                             GL_DEPTH_ATTACHMENT_EXT,
-//                                             GL_RENDERBUFFER_EXT,
-//                                             _Rbo.GetId()));
-// #endif
-
     nuxAssert( _Fbo.IsValid() == true );
 
     if (GetGraphicsDisplay()->GetGraphicsEngine())
 
=== modified file 'NuxGraphics/IOpenGLFrameBufferObject.h'
--- NuxGraphics/IOpenGLFrameBufferObject.h	2012-11-05 21:31:06 +0000
+++ NuxGraphics/IOpenGLFrameBufferObject.h	2012-11-28 15:20:28 +0000
@@ -105,6 +105,7 @@
 
     GLFramebufferObject _Fbo;   // The framebuffer object used for rendering to the texture
     GLRenderbuffer      _Rbo;
+    bool platform_support_for_depth_texture_;
 
     friend class GpuDevice;
   };