Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-20 05:03:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86817 commits 25 branches 28 tags 1.2 GiB
Commit graph

289 commits

Author SHA1 Message Date
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
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
Seth Alves
dd39d46883 fold WebEntityAPIHelper members into OffscreenQmlSurface 2016-09-09 13:41:09 -07:00
Seth Alves
02dba2fe49 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 11:23:37 -07:00
Seth Alves
ef8c2a2888 started to move WebEntityAPIHelper from RenderableWebEntityItem to OffscreenQmlSurface 2016-09-09 10:46:54 -07:00
Anthony J. Thibault
dc0d0c2d5c Merge branch 'master' into feature/tablet-ui-foundation 2016-09-07 09:49:55 -07:00
Brad Hefta-Gaub
418495d2c5 Merge pull request #8546 from samcake/yellow 
Revert the sRGB pixel format by default
 2016-09-03 10:16:16 -07:00
Anthony J. Thibault
0128d7c61b Merge branch 'master' into feature/tablet-ui-foundation 2016-09-02 12:16:25 -07:00
Anthony J. Thibault
442f6207fb Added raiseAndLowerKeyboard detector, streamlined EventBridge for web entities. 2016-09-02 11:17:08 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
samcake
b18c0d5325 Revert enabling sRGB for GLcontext pixel format 2016-08-30 12:44:35 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Davis
e4334be0cf Use synchronous logging (may impact performance when debugging is enabled) 2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2 Destroy contexts properly 2016-08-26 19:07:44 -07:00
Anthony J. Thibault
df17913801 Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Seth Alves
6b46b3082c try, try again 2016-08-18 11:45:03 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7de8cc6422 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-16 16:49:57 -07:00
Bradley Austin Davis
c303e1118a Only setup the debug logger once 2016-08-12 22:28:52 -07:00
Brad Davis
479b9a9f2b Cleanup GL helpers and debug logging 2016-08-12 22:28:39 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Anthony J. Thibault
8dac45c99e Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-10 11:27:21 -07:00
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -07:00
Zander Otavka
43bbe790d6 Add atp support to qml 2016-08-08 15:12:17 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
Brad Davis
faba1a4b4e Fix UI elements triggered by WebViews 2016-07-21 15:13:07 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
SamGondelman
0bfe3ea817 added support for disabling vsync on macs, but doesn't work with the rift 2016-06-27 11:34:44 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
samcake
75a5f6bd89 Intoducing the bluring as a separate Job reusable and the first version of curvature 2016-06-07 18:13:40 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
Brad Hefta-Gaub
d88185eb6c Merge pull request #7703 from zzmp/fix/gl-qml 
Set GL in QML immediately
 2016-04-19 11:11:27 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl 
Codify qt qml version in one header
 2016-04-11 09:45:21 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728 Codify qt qml version in one header 2016-04-07 17:35:31 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Zach Pomerantz
530cb40528 Check for valid qml gl context creation 2016-03-30 15:11:54 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
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