Merge lp:~loic.molinari/nux/nux-do-not-use-glBlendEquationSeparate-if-the-feature-is-not-available into lp:nux

[Loïc Molinari]

glBlendEquationSeparateEXT is used without checking if OpenGL 2.0 or if the GL_EXT_blend_equation_separate extension is available. If it's not, depending on the OpenGL implementation, it crashes.

This merge request fixes the issue.

[Loïc Molinari (loic.molinari)]

It's very likely to fix lp:722391 as well.

[Jay Taoko (jaytaoko)]

In NuxGraphics/GpuDevice.h, No need for a second nux namespace block. Just put 'class GpuRenderStates' in the namespace block that already exist.

review: Approve

[Loïc Molinari (loic.molinari)]

Alright, I usually do that out of habit in order to clearly separate forward declarations and code.

[lp:~loic.molinari/nux/nux-do-not-use-glBlendEquationSeparate-if-the-feature-is-not-available]

275. By Loïc Molinari on 2011-03-18

Merged the forward declaration block with the nux namespace

=== modified file 'NuxGraphics/GLRenderStates.cpp'
--- NuxGraphics/GLRenderStates.cpp	2011-03-08 01:22:58 +0000
+++ NuxGraphics/GLRenderStates.cpp	2011-03-18 11:25:36 +0000
@@ -109,9 +109,10 @@
   } s_StateLUT;
 
 
-  GpuRenderStates::GpuRenderStates (GpuBrand board)
+  GpuRenderStates::GpuRenderStates (GpuBrand board, GpuInfo* info)
   {
     _gpu_brand = board;
+    _gpu_info = info;
     Memcpy (&m_RenderStateChanges, &s_StateLUT.default_render_state, sizeof (m_RenderStateChanges) );
   }
 

=== modified file 'NuxGraphics/GLRenderStates.h'
--- NuxGraphics/GLRenderStates.h	2011-03-16 00:03:18 +0000
+++ NuxGraphics/GLRenderStates.h	2011-03-18 11:25:36 +0000
@@ -24,6 +24,7 @@
 #define GLRENDERSTATES_H
 
 #include "NuxCore/NuxCore.h"
+#include "NuxGraphics/GpuDevice.h"
 
 namespace nux
 {
@@ -111,15 +112,6 @@
     GFXSS_MAX_SAMPLERSTATES,
   };
 
-  //! Brand of GPUs.
-  typedef enum
-  {
-    GPU_VENDOR_UNKNOWN = 0,
-    GPU_BRAND_AMD,
-    GPU_BRAND_NVIDIA,
-    GPU_BRAND_INTEL,
-  } GpuBrand;
-
   typedef enum
   {
     CLEAR = 0,
@@ -148,7 +140,7 @@
   class GpuRenderStates
   {
   public:
-    GpuRenderStates (GpuBrand board);
+    GpuRenderStates (GpuBrand board, GpuInfo* info);
     ~GpuRenderStates();
 
     void ResetDefault();
@@ -272,6 +264,7 @@
   private:
 
     GpuBrand _gpu_brand;
+    GpuInfo *_gpu_info;
 
     inline void HW__EnableAlphaTest (t_u32 b);
 
@@ -953,7 +946,18 @@
       (BlendOpAlpha_ == GL_MAX),
       TEXT ("Error(HW__SetAlphaBlendOp): Invalid Blend Equation RenderState") );
 
-    CHECKGL (glBlendEquationSeparateEXT (BlendOpRGB_, BlendOpAlpha_) );
+    if (_gpu_info->SupportOpenGL20 ())
+    {
+      CHECKGL (glBlendEquationSeparate (BlendOpRGB_, BlendOpAlpha_) );
+    }
+    else if (_gpu_info->Support_EXT_Blend_Equation_Separate ())
+    {
+      CHECKGL (glBlendEquationSeparateEXT (BlendOpRGB_, BlendOpAlpha_) );
+    }
+    else
+    {
+      CHECKGL (glBlendEquation (BlendOpRGB_) );
+    }
 
     SET_RS_VALUE (m_RenderStateChanges[GFXRS_BLENDOP], BlendOpRGB_);
     SET_RS_VALUE (m_RenderStateChanges[GFXRS_BLENDOPALPHA], BlendOpAlpha_);

=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2011-03-10 04:28:21 +0000
+++ NuxGraphics/GpuDevice.cpp	2011-03-18 11:25:36 +0000
@@ -301,6 +301,8 @@
     _support_arb_texture_rectangle            = GLEW_ARB_texture_rectangle ? true : false;
     _support_nv_texture_rectangle             = GLEW_NV_texture_rectangle ? true : false;
     _support_arb_pixel_buffer_object          = GLEW_ARB_pixel_buffer_object ? true : false;
+    _support_ext_blend_equation_separate      = GLEW_EXT_blend_equation_separate ? true : false;
+
   }
 
 #if defined (NUX_OS_WINDOWS)
@@ -598,9 +600,9 @@
       _UsePixelBufferObject = false;
     }
 
-    _gpu_render_states = new GpuRenderStates (_gpu_brand);
     _gpu_info = new GpuInfo ();
     _gpu_info->Setup ();
+    _gpu_render_states = new GpuRenderStates (_gpu_brand, _gpu_info);
 
 #if defined(NUX_OS_WINDOWS)
     OGL_EXT_SWAP_CONTROL                = WGLEW_EXT_swap_control ? true : false;

=== modified file 'NuxGraphics/GpuDevice.h'
--- NuxGraphics/GpuDevice.h	2011-03-10 04:28:21 +0000
+++ NuxGraphics/GpuDevice.h	2011-03-18 11:25:36 +0000
@@ -26,12 +26,22 @@
 #include "GLResource.h"
 #include "GLDeviceFrameBufferObject.h"
 #include "GLDeviceObjects.h"
-#include "GLRenderStates.h"
 #include "GLTextureStates.h"
 #include "GLTemplatePrimitiveBuffer.h"
 
 namespace nux
 {
+  class GpuRenderStates;
+
+  //! Brand of GPUs.
+  typedef enum
+  {
+    GPU_VENDOR_UNKNOWN = 0,
+    GPU_BRAND_AMD,
+    GPU_BRAND_NVIDIA,
+    GPU_BRAND_INTEL,
+  } GpuBrand;
+
   template<typename T> class ObjectPtr;
 
   struct STREAMSOURCE
@@ -94,6 +104,7 @@
     bool Support_EXT_Texture_Rectangle ()         const    {return _support_ext_texture_rectangle;}
     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;}
 
     int GetMaxFboAttachment () {return _opengl_max_fb_attachment;}
 
@@ -136,6 +147,7 @@
     bool _support_arb_texture_rectangle; //!< Promoted from GL_EXT_TEXTURE_RECTANGLE to ARB.
     bool _support_nv_texture_rectangle;
     bool _support_arb_pixel_buffer_object;
+    bool _support_ext_blend_equation_separate;
 
     friend class GpuDevice;
   };