Merge lp:~unity-team/unity/unity.fix-noblur into lp:unity

[Jay Taoko]

* Fix for bug #839480
* Fix rendering of the Dash, Launcher and Panel when "NO_BLUR" is selected in CCSM
* Added support to get a none blurred region of the display from BackgroundEffectHelper

* Fix for bug #839480
* Fix rendering of the Dash, Launcher and Panel when "NO_BLUR" is selected in CCSM
* Added support to get a none blurred region of the display from BackgroundEffectHelper

[Jason Smith (jassmith)]

Works fine for me, +1

review: Approve

[Brandon Schaefer (brandontschaefer)]

One thing, the 'dash_is_open_' in unityshell.cpp isn't correctly handled anymore (There are cases when the dash is open and dash_is_open is false). So there is the launcher_controller->IsOverlayOpen() which will return true if any overlay (hud/dash) is open on any monitor. Or we should add an IsVisible() in the DashController, so we don't have to worry about the dash_is_open boolean being correctly updated.

review: Needs Fixing

[Gord Allott (gordallott)]

330 + // nux::LayerBlendMode layer_blend_mode = nux::LAYER_BLEND_MODE_OVERLAY;
331 + // if (_menu_view->GetMaximizedWindow() != 0)
332 + // {
333 + // layer_blend_mode = nux::LAYER_BLEND_MODE_NORMAL;
334 + // }
335 +

just a few comments that were added but shouldn't be, lets remove those

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Fixed those 2 issues, Thanks Jay awesome work! The panel looks soo much better!

[Brandon Schaefer (brandontschaefer)]

review: Approve

[Gord Allott (gordallott)]

review: Approve

[Omer Akram (om26er)]

this branch seems to cause bug 974408

=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.cpp'
--- plugins/unityshell/src/BackgroundEffectHelper.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/BackgroundEffectHelper.cpp	2012-04-05 06:31:21 +0000
@@ -321,3 +321,89 @@
   cache_dirty = false;
   return blur_texture_;
 }
+
+nux::ObjectPtr<nux::IOpenGLBaseTexture> BackgroundEffectHelper::GetRegion(nux::Geometry geo, bool force_update)
+{
+  bool should_update = force_update || cache_dirty;
+
+  /* Static blur: only update when the size changed */
+  if ((!should_update)
+      && blur_texture_.IsValid()
+      && (geo == blur_geometry_))
+  {
+    return blur_texture_;
+  }
+
+  nux::GraphicsEngine* graphics_engine = nux::GetGraphicsDisplay()->GetGraphicsEngine();
+  
+  int monitor_width = BackgroundEffectHelper::monitor_rect_.width;
+  int monitor_height = BackgroundEffectHelper::monitor_rect_.height;
+
+  nux::Geometry temp = geo;
+  temp.OffsetPosition(-monitor_rect_.x, -monitor_rect_.y);
+  blur_geometry_ =  nux::Geometry(0, 0, monitor_width, monitor_height).Intersect(temp);
+
+  nux::GpuDevice* gpu_device = nux::GetGraphicsDisplay()->GetGpuDevice();
+  if (blur_geometry_.IsNull() || !gpu_device->backup_texture0_.IsValid())
+  {
+    return nux::ObjectPtr<nux::IOpenGLBaseTexture>();
+  }
+
+  // save the current fbo
+  nux::ObjectPtr<nux::IOpenGLFrameBufferObject> current_fbo = gpu_device->GetCurrentFrameBufferObject();
+  gpu_device->DeactivateFrameBuffer();
+
+  // Set a viewport to the requested size
+  // FIXME: We need to do multiple passes for the dirty region
+  // on the underlying backup texture so that we're only updating
+  // the bits that we need
+  graphics_engine->SetViewport(0, 0, blur_geometry_.width, blur_geometry_.height);
+  graphics_engine->SetScissor(0, 0, blur_geometry_.width, blur_geometry_.height);
+  // Disable nux scissoring
+  graphics_engine->GetRenderStates ().EnableScissor (false);
+
+  // The background texture is the same size as the monitor where we are rendering.
+  nux::TexCoordXForm texxform__bg;
+  texxform__bg.flip_v_coord = false;
+  texxform__bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+  texxform__bg.uoffset = ((float) blur_geometry_.x) / monitor_width;
+  texxform__bg.voffset = ((float) monitor_height - blur_geometry_.y - blur_geometry_.height) / monitor_height;
+
+  {
+    nux::ObjectPtr<nux::IOpenGLBaseTexture> device_texture = gpu_device->backup_texture0_;
+    nux::ObjectPtr<nux::CachedBaseTexture> noise_device_texture = graphics_engine->CacheResource(noise_texture_);
+
+    unsigned int offset = 0;
+    int quad_width = blur_geometry_.width;
+    int quad_height = blur_geometry_.height;
+
+    unsigned int buffer_width = quad_width + 2 * offset;
+    unsigned int buffer_height = quad_height + 2 * offset;
+
+    texxform__bg.SetFilter(nux::TEXFILTER_NEAREST, nux::TEXFILTER_NEAREST);
+    texxform__bg.flip_v_coord = true;
+
+    // Copy source texture
+    graphics_engine->QRP_GetCopyTexture(buffer_width, buffer_height,
+                                        blur_texture_, device_texture,
+                                        texxform__bg, nux::color::White);
+  }
+
+  if (current_fbo.IsValid())
+  {
+    current_fbo->Activate(true);
+    graphics_engine->Push2DWindow(current_fbo->GetWidth(), current_fbo->GetHeight());
+    graphics_engine->GetRenderStates ().EnableScissor (true);
+  }
+  else
+  {
+    graphics_engine->SetViewport(0, 0, monitor_width, monitor_height);
+    graphics_engine->Push2DWindow(monitor_width, monitor_height);
+
+    graphics_engine->ApplyClippingRectangle();
+  }
+
+  cache_dirty = false;
+  return blur_texture_;
+}
+
 
=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.h'
--- plugins/unityshell/src/BackgroundEffectHelper.h	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/BackgroundEffectHelper.h	2012-04-05 06:31:21 +0000
@@ -50,6 +50,8 @@
   // We could add more functions here to get different types of effects based on the background texture
   nux::ObjectPtr<nux::IOpenGLBaseTexture> GetPixelatedRegion(nux::Rect rect, int pixel_size, bool update);
 
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> GetRegion(nux::Geometry geo, bool force_update = false);
+
   void DirtyCache();
 
   static void ProcessDamage(nux::Geometry geo);
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-04-05 00:32:14 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-04-05 06:31:21 +0000
@@ -1944,48 +1944,54 @@
 
   if (IsOverlayOpen())
   {
+    nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
+    nux::ObjectPtr<nux::IOpenGLBaseTexture> blur_texture;
+
     if (BackgroundEffectHelper::blur_type != unity::BLUR_NONE && (bkg_box.x + bkg_box.width > 0))
     {
-      nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, base.width, base.height);
-      auto blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
-
-      if (blur_texture.IsValid())
-      {
-        nux::TexCoordXForm texxform_blur_bg;
-        texxform_blur_bg.flip_v_coord = true;
-        texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
-        texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
-        texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
-
-        GfxContext.PushClippingRectangle(bkg_box);
+      blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
+    }
+    else
+    {
+      blur_texture = bg_effect_helper_.GetRegion(blur_geo); 
+    }
+
+    if (blur_texture.IsValid())
+    {
+      nux::TexCoordXForm texxform_blur_bg;
+      texxform_blur_bg.flip_v_coord = true;
+      texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform_blur_bg.uoffset = ((float) base.x) / geo_absolute.width;
+      texxform_blur_bg.voffset = ((float) base.y) / geo_absolute.height;
+
+      GfxContext.PushClippingRectangle(bkg_box);
 
 #ifndef NUX_OPENGLES_20
-        if (GfxContext.UsingGLSLCodePath())
-          gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                            blur_texture,
-                                            texxform_blur_bg,
-                                            nux::color::White,
-                                            _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                            true, ROP);
-        else
-          gPainter.PushDrawTextureLayer(GfxContext, base,
-                                        blur_texture,
-                                        texxform_blur_bg,
-                                        nux::color::White,
-                                        true,
-                                        ROP);
+      if (GfxContext.UsingGLSLCodePath())
+        gPainter.PushDrawCompositionLayer(GfxContext, base,
+                                          blur_texture,
+                                          texxform_blur_bg,
+                                          nux::color::White,
+                                          _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+                                          true, ROP);
+      else
+        gPainter.PushDrawTextureLayer(GfxContext, base,
+                                      blur_texture,
+                                      texxform_blur_bg,
+                                      nux::color::White,
+                                      true,
+                                      ROP);
 #else
-          gPainter.PushDrawCompositionLayer(GfxContext, base,
-                                            blur_texture,
-                                            texxform_blur_bg,
-                                            nux::color::White,
-                                            _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
-                                            true, ROP);
+        gPainter.PushDrawCompositionLayer(GfxContext, base,
+                                          blur_texture,
+                                          texxform_blur_bg,
+                                          nux::color::White,
+                                          _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+                                          true, ROP);
 #endif
-        GfxContext.PopClippingRectangle();
+      GfxContext.PopClippingRectangle();
 
-        push_count++;
-      }
+      push_count++;
     }
 
     unsigned int alpha = 0, src = 0, dest = 0;
 
=== modified file 'plugins/unityshell/src/OverlayRenderer.cpp'
--- plugins/unityshell/src/OverlayRenderer.cpp	2012-03-21 14:18:06 +0000
+++ plugins/unityshell/src/OverlayRenderer.cpp	2012-04-05 06:31:21 +0000
@@ -251,39 +251,42 @@
   texxform_absolute_bg.voffset = ((float) content_geo.y) / absolute_geo.height;
   texxform_absolute_bg.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
 
+  nux::Geometry blur_geo(absolute_geo.x, absolute_geo.y, content_geo.width, content_geo.height);
   if (paint_blur)
   {
-    nux::Geometry blur_geo(absolute_geo.x, absolute_geo.y, content_geo.width, content_geo.height);
     bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
-
-    if (bg_blur_texture_.IsValid())
-    {
-      nux::Geometry bg_clip = geo;
-      gfx_context.PushClippingRectangle(bg_clip);
-
-      gfx_context.GetRenderStates().SetBlend(false);
+  }
+  else
+  {
+    bg_blur_texture_ = bg_effect_helper_.GetRegion(blur_geo); 
+  }
+
+  if (bg_blur_texture_.IsValid())
+  {
+    nux::Geometry bg_clip = geo;
+    gfx_context.PushClippingRectangle(bg_clip);
+
+    gfx_context.GetRenderStates().SetBlend(false);
 #ifndef NUX_OPENGLES_20
-      if (gfx_context.UsingGLSLCodePath())
-        gfx_context.QRP_GLSL_ColorBlendOverTex (content_geo.x, content_geo.y,
-                                             content_geo.width, content_geo.height,
-                                             bg_blur_texture_, texxform_absolute_bg, nux::color::White,
-                                             bg_color_, nux::LAYER_BLEND_MODE_OVERLAY);
+    if (gfx_context.UsingGLSLCodePath())
+      gfx_context.QRP_GLSL_ColorBlendOverTex (content_geo.x, content_geo.y,
+                                           content_geo.width, content_geo.height,
+                                           bg_blur_texture_, texxform_absolute_bg, nux::color::White,
+                                           bg_color_, nux::LAYER_BLEND_MODE_OVERLAY);
 
-      else
-        gfx_context.QRP_1Tex (content_geo.x, content_geo.y,
-                              content_geo.width, content_geo.height,
-                              bg_blur_texture_, texxform_absolute_bg, nux::color::White);
+    else
+      gfx_context.QRP_1Tex (content_geo.x, content_geo.y,
+                            content_geo.width, content_geo.height,
+                            bg_blur_texture_, texxform_absolute_bg, nux::color::White);
 #else
-        gfx_context.QRP_GLSL_ColorBlendOverTex (content_geo.x, content_geo.y,
-                                        content_geo.width, content_geo.height,
-                                        bg_blur_texture_, texxform_absolute_bg, nux::color::White,
-                                        bg_color_, nux::LAYER_BLEND_MODE_OVERLAY);
+      gfx_context.QRP_GLSL_ColorBlendOverTex (content_geo.x, content_geo.y,
+                                      content_geo.width, content_geo.height,
+                                      bg_blur_texture_, texxform_absolute_bg, nux::color::White,
+                                      bg_color_, nux::LAYER_BLEND_MODE_OVERLAY);
 
 #endif
-      gPainter.PopBackground();
 
-      gfx_context.PopClippingRectangle();
-    }
+    gfx_context.PopClippingRectangle();
   }
 
   // Draw the left and top lines
@@ -376,7 +379,6 @@
 
 void OverlayRendererImpl::DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry content_geo, nux::Geometry absolute_geo, nux::Geometry geometry)
 {
-  bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
   nux::Geometry geo = geometry;
   bgs = 0;
 
@@ -397,7 +399,7 @@
   rop.SrcBlend = GL_ONE;
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
-  if (bg_blur_texture_.IsValid() && paint_blur)
+  if (bg_blur_texture_.IsValid())
   {
 #ifndef NUX_OPENGLES_20
     if (gfx_context.UsingGLSLCodePath())
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2012-03-29 03:07:39 +0000
+++ plugins/unityshell/src/PanelView.cpp	2012-04-05 06:31:21 +0000
@@ -237,12 +237,20 @@
 
   GfxContext.PushClippingRectangle(GetGeometry());
 
-  if (BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
+  if ((_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry blur_geo(geo_absolute.x, geo_absolute.y, geo.width, geo.height);
-    bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
+    
+    if (BackgroundEffectHelper::blur_type != BLUR_NONE)
+    {
+      bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(blur_geo);
+    }
+    else
+    {
+      bg_blur_texture_ = bg_effect_helper_.GetRegion(blur_geo); 
+    }
 
-    if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || _opacity != 1.0f))
+    if (bg_blur_texture_.IsValid() && (_overlay_is_open || _opacity != 1.0f))
     {
       nux::TexCoordXForm texxform_blur_bg;
       texxform_blur_bg.flip_v_coord = true;
@@ -318,7 +326,7 @@
   GfxContext.GetRenderStates().SetBlend(true);
   GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
-  if (bg_blur_texture_.IsValid() && BackgroundEffectHelper::blur_type != BLUR_NONE && (_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
+  if (bg_blur_texture_.IsValid() && (_overlay_is_open || (_opacity != 1.0f && _opacity != 0.0f)))
   {
     nux::Geometry geo_absolute = GetAbsoluteGeometry ();
     nux::TexCoordXForm texxform_blur_bg;
 
=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2012-03-21 14:18:06 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2012-04-05 06:31:21 +0000
@@ -426,8 +426,6 @@
   nux::Geometry const& base = GetGeometry();
   graphics_engine.PushClippingRectangle(base);
 
-  nux::GetPainter().PaintBackground(graphics_engine, base);
-
   if (ShouldBeHighlighted())
   {
     nux::Geometry geo(_header_layout->GetGeometry());
 
=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2012-03-21 14:18:06 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2012-04-05 06:31:21 +0000
@@ -620,8 +620,6 @@
 
 void ResultViewGrid::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
-  gPainter.PaintBackground(GfxContext, GetGeometry());
-
   int items_per_row = GetItemsPerRow();
   uint total_rows = (!expanded) ? 0 : (results_.size() / items_per_row) + 1;
 
 
=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.cpp'
--- plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2012-04-05 06:31:21 +0000
@@ -101,9 +101,6 @@
 
 void unity::ScreenEffectFramebufferObject::bind (const nux::Geometry &output)
 {
-  if (!BackgroundEffectHelper::HasDirtyHelpers())
-    return;
-
   /* Clear the error bit */
   glGetError ();
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-05 03:28:27 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-05 06:31:21 +0000
@@ -128,6 +128,8 @@
   , painting_tray_ (false)
   , last_scroll_event_(0)
   , hud_keypress_time_(0)
+  , panel_texture_has_changed_(true)
+  , paint_panel_(false)
 {
   Timer timer;
   gfloat version;
@@ -371,8 +373,11 @@
 
        RaiseInputWindows();
      });
-      LOG_INFO(logger) << "UnityScreen constructed: " << timer.ElapsedSeconds() << "s";
+
+     LOG_INFO(logger) << "UnityScreen constructed: " << timer.ElapsedSeconds() << "s";
   }
+
+  panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged));
 }
 
 UnityScreen::~UnityScreen()
@@ -723,6 +728,12 @@
   wy = y + (last_bound.height - height) / 2;
 }
 
+void
+UnityScreen::OnPanelStyleChanged()
+{
+  panel_texture_has_changed_ = true;
+}
+
 #ifdef USE_GLES
 void UnityScreen::paintDisplay()
 #else
@@ -734,6 +745,37 @@
 
 #ifndef USE_GLES
   bool was_bound = _fbo->bound ();
+
+  if (was_bound && launcher_controller_->IsOverlayOpen() && paint_panel_)
+  {
+    if (panel_texture_has_changed_ || !panel_texture_.IsValid())
+    {
+      panel_texture_.Release();
+
+      nux::NBitmapData* bitmap = panel::Style::Instance().GetBackground(screen->width (), screen->height(), 1.0f);
+      nux::BaseTexture* texture2D = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
+      if (bitmap && texture2D)
+      {
+        texture2D->Update(bitmap);
+        panel_texture_ = texture2D->GetDeviceTexture();
+        texture2D->UnReference();
+        delete bitmap;
+      }
+      panel_texture_has_changed_ = false;
+    }
+
+    if (panel_texture_.IsValid())
+    {
+      nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetModelViewMatrixStack();
+      nux::GetGraphicsDisplay()->GetGraphicsEngine()->Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
+      nux::GetGraphicsDisplay()->GetGraphicsEngine()->ResetProjectionMatrix();
+      nux::GetGraphicsDisplay()->GetGraphicsEngine()->SetOrthographicProjectionMatrix(screen->width (), screen->height());
+
+      nux::TexCoordXForm texxform;
+      nux::GetGraphicsDisplay()->GetGraphicsEngine()->QRP_GLSL_1Tex(0, 0, screen->width (), 24, panel_texture_, texxform, nux::color::White);
+    }
+  }
+
   _fbo->unbind ();
 
   /* Draw the bit of the relevant framebuffer for each output */
@@ -748,7 +790,7 @@
     glPopMatrix ();
   }
 
-  nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> device_texture =
       nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(_fbo->texture(),
                                                                        screen->width (), screen->height(), 1, nux::BITFMT_R8G8B8A8);
 #else
@@ -1217,6 +1259,7 @@
   doShellRepaint = true;
   allowWindowPaint = true;
   _last_output = output;
+  paint_panel_ = false;
 
 #ifndef USE_GLES
   /* bind the framebuffer here
@@ -2214,6 +2257,22 @@
                          const CompRegion& region,
                          unsigned int mask)
 {
+  if (uScreen->doShellRepaint && !uScreen->paint_panel_ && window->type() == CompWindowTypeNormalMask)
+  {
+    guint32 id = window->id();
+    bool maximized = WindowManager::Default()->IsWindowMaximized(id);
+    bool on_current = window->onCurrentDesktop();
+    bool override_redirect = window->overrideRedirect();
+    bool managed = window->managed();
+    CompPoint viewport = window->defaultViewport();
+    int output = window->outputDevice();
+
+    if (maximized && on_current && !override_redirect && managed && viewport == uScreen->screen->vp() && output == (int)uScreen->screen->currentOutputDev().id())
+    {
+      uScreen->paint_panel_ = true;
+    }
+  }
+
   if (uScreen->doShellRepaint && !uScreen->forcePaintOnTop ())
   {
     std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
@@ -2222,6 +2281,7 @@
     for (CompWindow* w = window; w && uScreen->doShellRepaint; w = w->prev)
     {
       auto id = w->id();
+
       for (unsigned int i = 0; i < size; ++i)
       {
         if (xwns[i] == id)
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-04-05 03:21:31 +0000
+++ plugins/unityshell/src/unityshell.h	2012-04-05 06:31:21 +0000
@@ -273,6 +273,8 @@
 
   void InitHints();
 
+  void OnPanelStyleChanged();
+
   dash::Settings dash_settings_;
   dash::Style    dash_style_;
   panel::Style   panel_style_;
@@ -342,6 +344,10 @@
 
   GLMatrix panel_shadow_matrix_;
 
+  bool panel_texture_has_changed_;
+  bool paint_panel_;
+  nux::ObjectPtr<nux::IOpenGLBaseTexture> panel_texture_;
+
 #ifndef USE_GLES
   ScreenEffectFramebufferObject::GLXGetProcAddressProc glXGetProcAddressP;
 #endif