61 commits

Author	SHA1	Message	Date
Zach Pomerantz	b252139704	LMK when running with old GL version	2016-03-25 14:42:58 -07:00
Zach Pomerantz	1405daa4ee	Add guards when checking vsync	2016-03-25 14:18:12 -07:00
Zach Pomerantz	a34e6773a9	Add messageBox for no gl support	2016-03-24 15:13:38 -07:00
Brad Davis	84dc15aff6	Fix potential deadlock in QML	2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub	08b87b9b98	Merge pull request #7434 from zzmp/clean/incomplete-fbo ... Clean up QML Render Thread	2016-03-23 10:43:21 -07:00
Zach Pomerantz	40b21933a5	Clean QML Surface render log	2016-03-22 18:42:54 -07:00
Zach Pomerantz	fe1d8b24b4	Lock the QML Surface resizing better	2016-03-22 18:42:46 -07:00
Zach Pomerantz	b41c106f3c	Only set the context once per QML surface	2016-03-22 18:40:58 -07:00
Zach Pomerantz	745438148a	Reset deadlock watch before qml load	2016-03-22 17:17:36 -07:00
Zach Pomerantz	e28a876629	Compare gl to GL_NO_ERROR, not GLEW_OK	2016-03-22 13:25:43 -07:00
Zach Pomerantz	471ac80135	Revert most of "Rm extra GL logging"	2016-03-22 13:24:29 -07:00
Zach Pomerantz	362e288be8	Rm mystery GL error before qml fbo	2016-03-22 12:05:24 -07:00
Zach Pomerantz	23e3b7e4e3	Rm extra GL logging	2016-03-22 12:04:58 -07:00
Zach Pomerantz	cc83a9bc36	Actually loop qml render and wake on pause	2016-03-21 14:36:45 -07:00
Zach Pomerantz	d3d0f229aa	Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread	2016-03-21 11:25:14 -07:00
Zach Pomerantz	41fcf4cc6d	Forward declare qml render thread	2016-03-21 11:18:18 -07:00
Zach Pomerantz	62e635a52a	Compile qml render thread on *nix	2016-03-18 18:43:59 -07:00
Zach Pomerantz	12aa057ff6	Always log if gl context fails	2016-03-18 18:37:14 -07:00
Zach Pomerantz	f987da4c43	Move qml rendering to defined thread	2016-03-18 18:10:45 -07:00
Zach Pomerantz	60f22c51b9	Check qml gl context on create	2016-03-17 16:56:23 -07:00
Bradley Austin Davis	7045680bc7	Reduce crashes on switching display plugins	2016-03-17 10:13:52 -07:00
Brad Hefta-Gaub	0c12c6ef90	dont be an idiot	2016-03-10 16:14:56 -08:00
Brad Hefta-Gaub	ff30611234	first cut at getting overlays to toggle again	2016-03-10 16:07:49 -08:00
Brad Davis	b2be54a179	Ensure we don't get trapped in the QML rendering loop on shutdown	2016-03-09 13:45:00 -08:00
Bradley Austin Davis	7d046c30a9	Bypass baffling OSX GL error	2016-03-08 12:23:29 -08:00
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
Brad Davis	b4a7dc113e	Safer shutdown behavior in QML surfaces	2016-02-22 14:25:30 -08:00
Brad Davis	64ec56bf89	Guards and warnings in QML rendering	2016-02-19 15:36:51 -08:00
Brad Davis	a4f2fc58fd	Ensure the QML content gets destroyed on deletion of a QML surface	2016-02-10 11:27:18 -08:00
Bradley Austin Davis	ebf0bf394a	Fix native text rendering by forcing positions to integer values	2016-02-05 11:43:31 -08:00
Atlante45	ad215f23c6	Deactivate SSBOs for now	2016-02-01 22:41:01 +01:00
Atlante45	52885545ea	Use feature name for ifdef	2016-02-01 18:50:01 +01:00
David Rowe	6232a83f43	Specify minimum OpenGL version in gl library's config ... Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface soon properly supporting both 4.1 and 4.3 on Windows.	2016-01-29 13:03:54 +13:00
David Rowe	2020514974	Move OpenGLVersionChecker to gl library	2016-01-29 12:29:21 +13:00
Brad Davis	cea57a111b	Desktop cleanup	2016-01-26 16:56:33 -08:00
Brad Davis	d2900200a1	More cleanup & menu fixing	2016-01-20 11:23:56 -08:00
Brad Davis	b6272b7824	Migrate tool window to overlay/QML	2016-01-13 15:40:37 -08:00
Brad Davis	660304a0a3	Stop QML hanging the app on shutdown	2016-01-07 12:25:25 -08:00
Brad Davis	a0196f0cde	Ensure we don't hang if the QML thread doesn't shutdown	2015-12-31 15:23:39 -08:00
Brad Davis	462cc325e5	Cleanup, moving some QML objects to OffscreenUI	2015-12-31 12:39:56 -08:00
Brad Davis	6098c4a1d6	Revert "Revert "Migrate QML based web views to Qt WebEngine"" ... This reverts commit 1f3adeb666.	2015-12-18 17:18:46 -08:00
Brad Davis	1f3adeb666	Revert "Migrate QML based web views to Qt WebEngine"	2015-12-18 17:09:38 -08:00
Brad Davis	88b88a3306	Fixing warnings	2015-12-18 14:32:35 -08:00
Brad Davis	fa5bab08b1	Support web content inside QML	2015-12-16 16:25:38 -08:00
Atlante45	d9583064f1	Move QOpenGL wrappers to the gl lib	2015-12-11 16:31:27 -08:00
Atlante45	9e51947c25	More warning fixes	2015-12-11 16:31:27 -08:00
Bradley Austin Davis	04b8251a83	Refactoring escrow due to long unsignaled syncs reported by Philip	2015-12-11 15:05:38 -08:00
Bradley Austin Davis	ae1345bb13	Adding nsight instrumenting to the QML render thread	2015-12-11 11:00:33 -08:00
Bradley Austin Davis	265bd8ee67	Moving QML rendering off the main thread	2015-12-11 10:28:31 -08:00
Bradley Austin Davis	b7aeb34a8c	Fix crashes on exit due to poor cleanup	2015-12-07 17:50:08 -08:00