[FIX #2] Fixed i3/i5 intel hd graphics bugs: copying texture after ea…

…ch effects has strange effects
moldeo · Aug 30, 2015 · d842ad9 · d842ad9
1 parent 0702ae7
commit d842ad9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/libmoldeo/moConsole.cpp b/libmoldeo/moConsole.cpp
@@ -1568,12 +1568,12 @@ moConsole::Draw() {
                         RenderMan->BeginDrawEffect();
                         pEffect->Draw(&m_ConsoleState.tempo);
                         RenderMan->EndDrawEffect();
-                        RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX);
+                        //RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX);
                 }
             }
         }
 
-        //RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX);
+        RenderMan->CopyRenderToTexture(MO_EFFECTS_TEX);
     }
 
 		//sedibujan los post Effects

diff --git a/libmoldeo/moEffect.cpp b/libmoldeo/moEffect.cpp
@@ -93,7 +93,7 @@ moEffect::PreInit() {
 	devicecode = NULL;
 	m_EffectState.Init();
 
-    glewInit();
+    //glewInit();
 
     /** Crea INLETS INTERNOS, es decir que no tienen un parametro asociado... (especificamente para su uso generico*/
     moInlet* Inlet = new moInlet();
@@ -282,10 +282,11 @@ void moEffect::EndDraw() {
     if (m_pResourceManager->GetGLMan())
         m_pResourceManager->GetGLMan()->CheckErrors( GetName()+"::"+GetConfigName()+"::"+GetLabelName() );
 */
-
+/*
   if (m_pResourceManager)
     if (m_pResourceManager->GetRenderMan())
-      m_pResourceManager->GetRenderMan()->EndDrawEffect();
+      m_pResourceManager->GetRenderMan()->EndDrawEffect();
+*/
 }
 
 

diff --git a/libmoldeo/moRenderManager.cpp b/libmoldeo/moRenderManager.cpp
@@ -305,8 +305,8 @@ void moRenderManager::BeginUpdateObject()
 
 void moRenderManager::EndUpdateObject()
 {
-    m_pGLManager->RestoreGLState();
-    Unlock();
+  m_pGLManager->RestoreGLState();
+  Unlock();
 }
 
 void moRenderManager::BeginDraw()
@@ -317,7 +317,7 @@ void moRenderManager::BeginDraw()
 
 void moRenderManager::BeginDrawEffect()
 {
-    Lock();
+  Lock();
 	if (m_pGLManager) m_pGLManager->SaveGLState();
 	if (m_pGLManager) m_pGLManager->SetPerspectiveView(m_render_width, m_render_height);
 	m_saved_screen = false;

diff --git a/moldeoversion.txt b/moldeoversion.txt
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <moldeo api="1.0">
-	<version major="1" minor="0" release="beta" build="137">1.0 beta (build 137)</version>
+	<version major="1" minor="0" release="beta" build="138">1.0 beta (build 138)</version>
 	<comments></comments>
 </moldeo>