Commit graph

266 commits

Author SHA1 Message Date
Brad Davis
80c83fb4fb Switch back to Qt for GL context creation by default 2018-11-01 12:28:21 -07:00
Brad Davis
a3a952265a Fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039 Fix crash on startup on windows / android 2018-10-26 11:23:30 -07:00
Brad Davis
9a30073f27 Only enable debug GL context on demand 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Brad Davis
339b25a362 Fix access to uniforms at index 0 2018-10-23 08:36:18 -07:00
Brad Davis
a93aa68901 Add additional safety checks to gl::Uniform::load 2018-10-19 16:20:09 -07:00
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Brad Davis
df031b5d93 Fix procedural rendering with custom uniforms 2018-08-03 14:58:12 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
7e16325805 Unit testing cached and uncached shader loading 2018-05-24 12:42:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Brad Davis
1d403b4d67 Add texture transfer testing 2018-05-09 13:20:47 -07:00
Brad Davis
44816941fc Fix debug assert in manipulating thread local data to store GL surfaces 2018-04-25 13:51:27 -07:00
Brad Davis
d478204722 Working on splash rendering 2018-04-17 14:17:41 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Brad Davis
6fe75a3ca4 Breaking out common gpu-gl code 2018-03-09 16:39:47 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
samcake
0885b00ab8 Merge branch 'master' of https://github.com/highfidelity/hifi into pastel 2018-01-31 14:18:38 -08:00
Brad Davis
9893273d33 Trying to fix AMD crash in QML rendering 2018-01-31 08:36:52 -08:00
samcake
d5e52834ef cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 13:07:20 -08:00
samcake
2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation 2018-01-30 12:52:05 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
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