Use improved blur shader with blur-process-fbo in nvgSurface

Author: alcomposer

Libraries/nanovg

@@ -2692,7 +2692,6 @@ void Canvas::showSuggestions(Object* object, TextEditor* textEditor)
 }
 void Canvas::hideSuggestions()
 {
-    std::cout << "hideSuggestions" << std::endl;
     suggestor->removeCalloutBox();
 }
 

Source/Canvas.cpp

@@ -182,6 +182,10 @@ void NVGSurface::detachContext()
             nvgDeleteFramebuffer(quickCanvasBlurFBO);
             quickCanvasBlurFBO = nullptr;
         }
+        if (quickCanvasBlurProcessFBO) {
+            nvgDeleteFramebuffer(quickCanvasBlurProcessFBO);
+            quickCanvasBlurProcessFBO = nullptr;
+        }
         if (nvg) {
             nvgDeleteContext(nvg);
             nvg = nullptr;
@@ -218,6 +222,10 @@ void NVGSurface::updateBufferSize()
             nvgDeleteFramebuffer(quickCanvasBlurFBO);
         quickCanvasBlurFBO = nvgCreateFramebuffer(nvg, scaledWidth, scaledHeight, NVG_IMAGE_PREMULTIPLIED);
 
+        if (quickCanvasBlurProcessFBO)
+            nvgDeleteFramebuffer(quickCanvasBlurProcessFBO);
+        quickCanvasBlurProcessFBO = nvgCreateFramebuffer(nvg, scaledWidth, scaledHeight, NVG_IMAGE_PREMULTIPLIED);
+
         fbWidth = scaledWidth;
         fbHeight = scaledHeight;
         invalidArea = getLocalBounds();
@@ -416,9 +424,11 @@ void NVGSurface::render()
                 nvgBlitFramebuffer(nvg, invalidFBO, 0, 0, fbWidth, fbHeight);
 
                 if (!approximatelyEqual(0.0f, cnv->quickCanvasAlpha)) {
-                    nvgBlurFramebuffer(nvg, quickCanvasBlurFBO, fbWidth, fbHeight, cnv->quickCanvasAlpha * 15, 1.0f);
+                    nvgBlurFramebuffer(nvg, quickCanvasBlurFBO, quickCanvasBlurProcessFBO, fbWidth, fbHeight, cnv->quickCanvasAlpha * getValue<float>(cnv->zoomScale));
                 }
 
+                nvgBindFramebuffer(quickCanvasBlurFBO);
+
                 nvgViewport(0, 0, fbWidth, fbHeight);
                 nvgBeginFrame(nvg, fbWidth, fbHeight, 1);
                 nvgGlobalScissor(nvg, 0, 0, fbWidth, fbHeight);

Source/NVGSurface.cpp

@@ -126,6 +126,7 @@ class NVGSurface :
 
     NVGframebuffer* quickCanvasFBO = nullptr;
     NVGframebuffer* quickCanvasBlurFBO = nullptr;
+    NVGframebuffer* quickCanvasBlurProcessFBO = nullptr;
     int fbWidth = 0, fbHeight = 0;
 
     static inline UnorderedMap<NVGcontext*, NVGSurface*> surfaces;