Merge branch 'master' of https://github.com/erwincoumans/bullet3

examples/StandaloneMain/hellovr_opengl_main.cpp

@@ -22,6 +22,7 @@
 int gSharedMemoryKey = -1;
 int  gDebugDrawFlags = 0;
 bool gDisplayDistortion = false;
+bool gDisableDesktopGL = false;
 
 //how can you try typing on a keyboard, without seeing it?
 //it is pretty funny, to see the desktop in VR!
@@ -834,6 +835,8 @@ void CMainApplication::RenderFrame()
 		}
 		RenderStereoTargets();
 
+		if (!gDisableDesktopGL)
+		{
 			if (gDisplayDistortion)
 			{
 				B3_PROFILE("RenderDistortion");
@@ -852,6 +855,7 @@ void CMainApplication::RenderFrame()
  				glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
 				glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0 );
 			}
+		}
 
 		vr::Texture_t leftEyeTexture = {(void*)leftEyeDesc.m_nResolveTextureId, vr::API_OpenGL, vr::ColorSpace_Gamma };
 		vr::VRCompositor()->Submit(vr::Eye_Left, &leftEyeTexture );
@@ -873,7 +877,10 @@ void CMainApplication::RenderFrame()
 	// SwapWindow
 	{
 		B3_PROFILE("m_app->swapBuffer");
+		if (!gDisableDesktopGL)
+		{
 			m_app->swapBuffer();
+		}
 		//SDL_GL_SwapWindow( m_pWindow );
 		
 	}
@@ -2216,6 +2223,11 @@ void CGLRenderModel::Draw()
 int main(int argc, char *argv[])
 {
 
+	b3CommandLineArgs args(argc,argv);
+	if (args.CheckCmdLineFlag("disable_desktop_gl"))
+	{
+		gDisableDesktopGL = true;
+	}
 
 #ifdef BT_USE_CUSTOM_PROFILER
 	b3SetCustomEnterProfileZoneFunc(dcEnter);