289 commits

Author	SHA1	Message	Date
Bradley Austin Davis	537db9acb3	Fixing OSX build	2018-01-15 09:07:20 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	55bfdc105b	Switch android to GLAD	2018-01-14 10:22:18 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	24b83aa0f1	Merge remote-tracking branch 'sam/android-gles' into windows_gles	2018-01-13 11:36:31 -08:00
Brad Davis	6313e3ea69	Allow building on Android with GLAD disabled	2018-01-13 11:31:50 -08:00
Sam Gateau	df0660f823	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -08:00
Brad Davis	51a0131414	Fix linkage	2018-01-12 19:37:28 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Brad Davis	ffbb5442c7	Last GL config fix	2018-01-12 08:58:13 -08:00
Brad Davis	8b2e8706ff	Fixing android GLES config	2018-01-12 00:42:46 -08:00
Brad Davis	22d133c71f	Allow GLES client on desktop builds	2018-01-11 23:31:34 -08:00
Anthony J. Thibault	59b843781e	Merge branch 'master' into feature/dual-quat	2018-01-08 13:18:42 -08:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Anthony J. Thibault	3896b31a72	Line numbers for shader when there are compilation errors	2018-01-04 16:13:46 -08:00
Gabriel Calero	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
Bradley Austin Davis	282ae7b6f9	Small fixes	2017-12-11 14:42:37 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Sam Cake	2b97171061	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 01:06:01 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
Seth Alves	36940b4dfe	revert commit that broke sendToScript	2017-04-10 09:11:23 -07:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
samcake	8b4696f4ec	Merge and solve conflicts	2017-04-04 13:28:03 -07:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -07:00
samcake	a882beb2fd	Trying to fix the overlay Image3D shading pipeline used	2017-04-03 17:35:28 -07:00
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
samcake	c3c73b209a	Fixing the bad rendering of the instanced primitives on 4.1	2017-04-03 11:49:00 -07:00
Vladyslav Stelmakhovskyi	990e1379e3	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task ... (cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	7318ec468b	Fixed warning QObject::connect: No such signal Desktop_QMLTYPE_217::sendToScript(QVariant) ... (cherry picked from commit ef4bea2cd4811364e65baec2c48ce2205a0e2cb3)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Seth Alves	208c4686c4	merge from upstream	2017-01-12 15:44:27 -08:00
Brad Davis	f235a52a6d	Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet	2017-01-11 14:21:29 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Brad Davis	9b0d0b3e7a	Updates to tracing, removing log spam	2016-12-19 15:12:48 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Anthony J. Thibault	319bb9ce78	Prototype of Tablet.qml hacked to appear on ALL web entities.	2016-12-08 15:31:00 -08:00
Bradley Austin Davis	5c3480e2a2	Preserve and restore the GL context when resizing QML surfaces	2016-12-07 05:02:45 -08:00
Brad Davis	3b07e31eab	Working on OpenGL debuggability	2016-11-29 13:15:56 -08:00
Brad Hefta-Gaub	5dd33c8dce	fix for mac min openGL version	2016-11-14 20:58:09 -08:00
samcake	0ab4a781f5	Back to the correct code	2016-11-09 18:25:37 -08:00
samcake	c01b39b54b	And test that again	2016-11-09 18:16:51 -08:00
samcake	941e5a57b1	trying a test with 4.4 as the minimum gl context to be able to break on Intel integrated	2016-11-09 17:25:46 -08:00
samcake	b7381c30cb	Including the fix for the bad Major Version number from David K	2016-11-09 10:38:44 -08:00
samcake	a4e75b4dcf	FIx an obvious mistake, good catch MR Zappoman	2016-11-08 14:51:48 -08:00
samcake	86a569651c	Add more precuation when extracting the opengl version in the openGLVersionChecker to avoid crashing	2016-11-07 14:45:26 -08:00
Zach Pomerantz	428bb8e518	rm unused OffscreenQmlSurface const	2016-10-27 14:40:51 -07:00
Brad Hefta-Gaub	001cfc7e15	Merge pull request #8901 from samcake/blue ... Adding more detailed counters for texture memory consumption	2016-10-25 16:19:56 -07:00
Brad Hefta-Gaub	822e088240	tweak format of gl_info	2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub	e22a2e9e2f	add gl info and gpu free memory to user stats	2016-10-25 14:56:54 -07:00
samcake	133b0b38fd	Fixing build issue on non win	2016-10-25 13:24:39 -07:00
samcake	c586bef452	Actually remove the multiplication of the color buffer cost by the swapchain length in the pixel SIze estimation since it doesn;t look true	2016-10-25 12:56:26 -07:00
samcake	507d3e5a39	IMprove the counting and namoing of the new couters the gl swapchain	2016-10-25 12:28:07 -07:00
sam	6b2b68e691	trying to add counters for the default FBO	2016-10-25 03:36:23 -07:00
Brad Davis	da9eb0433c	Remove workaround for QML HDPI offscreen rendering bug	2016-10-24 11:51:40 -07:00
Brad Davis	861b69aa94	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
Brad Davis	e9ac110072	Correct mip calculation	2016-10-21 17:05:56 -07:00
Brad Davis	1bd398ae5e	Report offscreen texture memory usage in stats	2016-10-21 11:31:37 -07:00
Brad Davis	c27ee634ea	Fix debug compile issues	2016-10-20 13:56:01 -07:00
Brad Davis	9523660027	Fix offscreen QML texture leak, improve texture sharing for same size surfaces	2016-10-20 11:55:25 -07:00
Brad Hefta-Gaub	4a6101060c	Merge pull request #8862 from zzmp/fix/quick-leak ... fix leak from qml surfaces' render controls	2016-10-20 08:23:28 -07:00
Zach Pomerantz	02b4c43cff	delete _renderControl after use	2016-10-19 17:09:29 -07:00
Zach Pomerantz	df51646307	add ctx to qml surface cxs	2016-10-19 16:56:13 -07:00
Stephen Birarda	b4b5c648c2	use a QWebEngineProfile request interceptor for auth in HTTP header	2016-10-17 11:34:37 -07:00
Brad Hefta-Gaub	aec76cd542	Merge pull request #8799 from ctrlaltdavid/21070 ... HMD keyboard polishing	2016-10-16 01:00:48 -07:00
Brad Davis	612a1b17ff	Magic number removal	2016-10-15 17:59:27 -07:00
Brad Davis	0be1f82bbc	Fix AMD crash caused by missing glFlush	2016-10-15 15:28:28 -07:00
David Rowe	2343e02454	Fix a couple of QML errors	2016-10-13 18:16:21 +13:00
David Rowe	a75925d1e3	Add numeric shift	2016-10-13 14:18:21 +13:00
David Rowe	e269a84d0e	Add placeholder "FIXME"s for making Web entity keyboard HMD-only	2016-10-13 09:35:39 +13:00
David Rowe	a1458a26fd	Merge branch 'master' into 21055 ... Conflicts: libraries/gl/src/gl/OffscreenQmlSurface.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-07 14:44:23 +13:00
David Rowe	bdff71151d	Updates from code review	2016-10-07 13:35:44 +13:00
Brad Davis	6afe5360fe	Fixing header	2016-10-05 14:36:26 -07:00
Brad Davis	caf7d87841	Restore GL context information to the QML context	2016-10-05 14:01:20 -07:00
Brad Davis	afbbd398dc	Remove QML threaded rendering	2016-10-05 13:48:16 -07:00
David Rowe	1a745094e2	Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h	2016-10-06 09:29:09 +13:00
Brad Hefta-Gaub	6f86ce8d3b	Merge pull request #8683 from jherico/oglplus_b_gone2 ... Remove all usage of oglplus	2016-10-05 09:59:42 -07:00
Brad Davis	ca3572f991	Support external GL textures with proper fencing	2016-10-03 17:09:10 -07:00
David Rowe	3d75188500	Untabify	2016-10-04 11:03:41 +13:00
David Rowe	3242a7884c	Apply fix from merge conflict to moved code	2016-10-04 11:02:14 +13:00
David Rowe	4818ad2615	Merge branch 'master' into 21055	2016-10-04 08:46:30 +13:00
Brad Davis	53f358d77a	Fix warnings	2016-10-02 11:44:36 -07:00
Brad Davis	488d191428	Remove all oglplus usage and references	2016-10-02 11:44:34 -07:00
Brad Davis	d83d3fe98e	Make shader compilation from non-GPU code easier	2016-10-02 11:44:32 -07:00
Brad Davis	f28962af12	Remove dead class from oglplus helpers	2016-10-02 11:44:32 -07:00
Brad Davis	933388bc61	Remove oglplus usage from offscreen UI	2016-10-01 11:39:46 -07:00
Brad Davis	0f06d0e4cc	Don't use GL functions before making the context current	2016-10-01 10:40:36 -07:00
David Rowe	a0dd3d8771	Debounce lowering keyboard and immediately raising it again	2016-09-30 13:43:55 +13:00