Merge pull request #5 from headupinclouds/pr.fix.flow.destruction

Pr.fix.flow.destruction
hunter-packages · Dec 18, 2016 · 7f0d180 · 7f0d180
2 parents 8d75fd1 + 6ae6fc4
commit 7f0d180
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/ogles_gpgpu/common/proc/flow.cpp b/ogles_gpgpu/common/proc/flow.cpp
@@ -441,7 +441,10 @@ Flow2Pipeline::Flow2Pipeline(float tau, float strength, bool doGray)
     procPasses.push_back(&m_pImpl->nmsProc);
 };
 
-Flow2Pipeline::~Flow2Pipeline() {}
+Flow2Pipeline::~Flow2Pipeline()
+{
+    procPasses.clear();
+}
 ProcInterface * Flow2Pipeline::getInputFilter() const { return &m_pImpl->grayProc; }
 
 #if USE_MEDIAN

diff --git a/ogles_gpgpu/common/proc/flow.h b/ogles_gpgpu/common/proc/flow.h
@@ -139,7 +139,7 @@ class Flow2Pipeline : public MultiPassProc
 public:
 
     Flow2Pipeline(float tau = 0.004f, float strength = 1.0f, bool doGray=false);
-    virtual ~Flow2Pipeline();
+    ~Flow2Pipeline();
 
     virtual float getStrength() const;
     virtual ProcInterface * corners(); // corner output

diff --git a/ogles_gpgpu/common/proc/grayscale.cpp b/ogles_gpgpu/common/proc/grayscale.cpp
@@ -23,6 +23,10 @@ const GLfloat GrayscaleProc::grayscaleConvVecBGR[3] = {
     0.114, 0.587, 0.299
 };
 
+const GLfloat GrayscaleProc::grayscaleConvVecNone[3] = {
+    1.0, 1.0, 1.0
+};
+
 const char *GrayscaleProc::fshaderGrayscaleSrc = OG_TO_STR(
 
 #if defined(OGLES_GPGPU_OPENGLES)
@@ -86,15 +90,16 @@ void GrayscaleProc::setGrayscaleConvType(GrayscaleInputConversionType type) {
 
     const GLfloat *v = NULL;
 
-    if (type == GRAYSCALE_INPUT_CONVERSION_RGB) {
-        v = &grayscaleConvVecRGB[0];
-    } else if (type == GRAYSCALE_INPUT_CONVERSION_BGR) {
-        v = &grayscaleConvVecBGR[0];
-    } else {
-        OG_LOGERR(getProcName(), "unknown grayscale input conversion type %d", type);
-        v = &grayscaleConvVecRGB[0];    // set default
+    switch(type)
+    {
+        case GRAYSCALE_INPUT_CONVERSION_RGB: v = &grayscaleConvVecRGB[0]; break;
+        case GRAYSCALE_INPUT_CONVERSION_BGR: v = &grayscaleConvVecBGR[0]; break;
+        case GRAYSCALE_INPUT_CONVERSION_NONE: v = &grayscaleConvVecNone[0]; break;
+        default:
+            v = &grayscaleConvVecNone[0];
+            OG_LOGERR(getProcName(), "unknown grayscale input conversion type %d", type);
     }
-
+    
     memcpy(grayscaleConvVec, v, sizeof(GLfloat) * 3);
 
     inputConvType = type;

diff --git a/ogles_gpgpu/common/proc/grayscale.h b/ogles_gpgpu/common/proc/grayscale.h
@@ -26,7 +26,7 @@ typedef enum {
     GRAYSCALE_INPUT_CONVERSION_NONE     = -2,
     GRAYSCALE_INPUT_CONVERSION_CUSTOM   = -1,
     GRAYSCALE_INPUT_CONVERSION_RGB      = 0,
-    GRAYSCALE_INPUT_CONVERSION_BGR,
+    GRAYSCALE_INPUT_CONVERSION_BGR      = 1,
 } GrayscaleInputConversionType;
 
 /**
@@ -99,6 +99,7 @@ class GrayscaleProc : public FilterProcBase {
     static const char *fshaderGrayscaleSrc;         // fragment shader source
     static const GLfloat grayscaleConvVecRGB[3];    // weighted channel grayscale conversion for RGB input (default)
     static const GLfloat grayscaleConvVecBGR[3];    // weighted channel grayscale conversion for BGR input
+    static const GLfloat grayscaleConvVecNone[3];   // identity transformation for pass through shader behavior
 
     GLint shParamUInputConvVec; // shader uniform weighted channel grayscale conversion vector