fix(GLRender): call glUseProgram when program changed

alibaba · Sep 18, 2020 · 6020c0e · 6020c0e
1 parent 668e076
commit 6020c0e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 4 deletions.
diff --git a/framework/render/video/glRender/CV420PProgramContext.cpp b/framework/render/video/glRender/CV420PProgramContext.cpp
@@ -121,6 +121,10 @@ int CV420PProgramContext::initProgram() {
     return 0;
 }
 
+void CV420PProgramContext::useProgram(){
+    glUseProgram(mCVProgram);
+}
+
 void CV420PProgramContext::updateScale(IVideoRender::Scale scale) {
     if (mScale != scale) {
         mScale = scale;

diff --git a/framework/render/video/glRender/CV420PProgramContext.h b/framework/render/video/glRender/CV420PProgramContext.h
@@ -27,6 +27,8 @@ class CV420PProgramContext : public IProgramContext {
 
     int initProgram() override;
 
+    void useProgram() override;
+
     void updateScale(IVideoRender::Scale scale) override;
 
     void updateRotate(IVideoRender::Rotate rotate) override;

diff --git a/framework/render/video/glRender/GLRender.cpp b/framework/render/video/glRender/GLRender.cpp
@@ -259,7 +259,7 @@ void GLRender::VSyncOnDestroy()
 {
     mPrograms.clear();
 
-    if(mContext == nullptr) {
+    if (mContext == nullptr) {
         return;
     }
 
@@ -273,7 +273,7 @@ void GLRender::VSyncOnDestroy()
 
 bool GLRender::renderActually()
 {
-    if(mContext == nullptr) {
+    if (mContext == nullptr) {
         return false;
     }
 
@@ -296,7 +296,6 @@ bool GLRender::renderActually()
     }
 
 #endif
-
     bool displayViewChanged  = false;
     {
         unique_lock<mutex> viewLock(mViewMutex);
@@ -523,7 +522,9 @@ void *GLRender::getSurface()
 IProgramContext *GLRender::getProgram(int frameFormat, IAFFrame *frame)
 {
     if (mPrograms.count(frameFormat) > 0) {
-        return mPrograms[frameFormat].get();
+        IProgramContext *pContext = mPrograms[frameFormat].get();
+        pContext->useProgram();
+        return pContext;
     }
 
     unique_ptr<IProgramContext> targetProgram{nullptr};

diff --git a/framework/render/video/glRender/IProgramContext.h b/framework/render/video/glRender/IProgramContext.h
@@ -42,6 +42,8 @@ class IProgramContext {
 
     virtual int initProgram() = 0;
 
+    virtual void useProgram() = 0;
+
     virtual void createSurface() {
     }
 

diff --git a/framework/render/video/glRender/OESProgramContext.cpp b/framework/render/video/glRender/OESProgramContext.cpp
@@ -97,6 +97,10 @@ int OESProgramContext::initProgram() {
     return 0;
 }
 
+void OESProgramContext::useProgram(){
+    glUseProgram(mOESProgram);
+}
+
 void OESProgramContext::updateScale(IVideoRender::Scale scale) {
     if (mScale != scale) {
         mScale = scale;

diff --git a/framework/render/video/glRender/OESProgramContext.h b/framework/render/video/glRender/OESProgramContext.h
@@ -18,6 +18,8 @@ class OESProgramContext : public IProgramContext , private DecoderSurfaceCallbac
 private:
     int initProgram() override;
 
+    void useProgram() override;
+
     void createSurface() override;
 
     void *getSurface() override;

diff --git a/framework/render/video/glRender/YUVProgramContext.cpp b/framework/render/video/glRender/YUVProgramContext.cpp
@@ -110,6 +110,10 @@ int YUVProgramContext::initProgram() {
     return 0;
 }
 
+void YUVProgramContext::useProgram(){
+    glUseProgram(mProgram);
+}
+
 void YUVProgramContext::updateScale(IVideoRender::Scale scale) {
     if (mScale != scale) {
         mScale = scale;

diff --git a/framework/render/video/glRender/YUVProgramContext.h b/framework/render/video/glRender/YUVProgramContext.h
@@ -17,6 +17,8 @@ class YUVProgramContext : public IProgramContext {
 private:
     int initProgram() override ;
 
+    void useProgram() override ;
+
     void updateScale(IVideoRender::Scale scale) override ;
 
     void updateFlip(IVideoRender::Flip flip) override ;