From 7cd962467eccef2c1a6534c0dc5cd79e06e58f2a Mon Sep 17 00:00:00 2001
From: bla <bla>
Date: Mon, 1 Oct 2018 18:51:02 -0700
Subject: [PATCH] fix EGL issue related to glViewport in startRender method

---
 examples/OpenGLWindow/EGLOpenGLWindow.cpp            |  3 +--
 .../eglPlugin/eglRendererVisualShapeConverter.cpp    | 12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/examples/OpenGLWindow/EGLOpenGLWindow.cpp b/examples/OpenGLWindow/EGLOpenGLWindow.cpp
index a3119ad47..6fb9797ae 100644
--- a/examples/OpenGLWindow/EGLOpenGLWindow.cpp
+++ b/examples/OpenGLWindow/EGLOpenGLWindow.cpp
@@ -248,7 +248,7 @@ void EGLOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
 	printf("GL_VERSION=%s\n", ver);
 	const GLubyte* sl = glGetString(GL_SHADING_LANGUAGE_VERSION);
 	printf("GL_SHADING_LANGUAGE_VERSION=%s\n", sl);
-
+	glViewport(0,0,m_data->m_windowWidth, m_data->m_windowHeight);
 	//int i = pthread_getconcurrency();
 	//printf("pthread_getconcurrency()=%d\n", i);
 }
@@ -273,7 +273,6 @@ void EGLOpenGLWindow::setRequestExit() {}
 void EGLOpenGLWindow::startRendering()
 {
 	// printf("EGL window start rendering.\n");
-	glViewport(0, 0, m_data->m_windowWidth, m_data->m_windowHeight);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 	glEnable(GL_DEPTH_TEST);
 }
diff --git a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp
index fbf4c7e97..973fc1b68 100644
--- a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp
+++ b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp
@@ -1006,19 +1006,9 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL(
 	{
 		if (startPixelIndex == 0)
 		{
-			glViewport(0, 0, sourceWidth, sourceHeight);
+			glViewport(0,0, sourceWidth, sourceHeight);	
 			m_data->m_window->endRendering();
 			m_data->m_window->startRendering();
-			/*
-			ATTRIBUTE_ALIGNED16(float viewMat[16]);
-			ATTRIBUTE_ALIGNED16(float projMat[16]);
-			m_data->m_camera.getCameraProjectionMatrix(projMat);
-			m_data->m_camera.getCameraViewMatrix(viewMat);
-			cout<<viewMat[4*0 + 0]<<" "<<viewMat[4*0+1]<<" "<<viewMat[4*0+2]<<" "<<viewMat[4*0+3] << endl;
-			cout<<viewMat[4*1 + 0]<<" "<<viewMat[4*1+1]<<" "<<viewMat[4*1+2]<<" "<<viewMat[4*1+3] << endl;
-			cout<<viewMat[4*2 + 0]<<" "<<viewMat[4*2+1]<<" "<<viewMat[4*2+2]<<" "<<viewMat[4*2+3] << endl;
-			cout<<viewMat[4*3 + 0]<<" "<<viewMat[4*3+1]<<" "<<viewMat[4*3+2]<<" "<<viewMat[4*3+3] << endl;
-			*/
 
 			B3_PROFILE("m_instancingRenderer render");
 			m_data->m_instancingRenderer->writeTransforms();