Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 12:11:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47780 commits 73 branches 59 tags 1.2 GiB
Commit graph

181 commits

Author SHA1 Message Date
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
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
875566d956 Raise and lower keyboard for HTML fields in Browser window 2016-09-28 16:40:38 +13:00
Zach Pomerantz
aeaae4ccc8 reload qml with scripts 2016-09-23 14:27:47 -07:00
David Rowe
e1164edfde Display keyboard only for editable fields 2016-09-22 15:28:49 +12:00
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -07:00