Commit graph

96 commits

Author SHA1 Message Date
Seth Alves
c5e1f2aedc change ContextStats::evalDelta to better handle wrapping values in graphics stats 2019-06-11 11:56:49 -07:00
Shannon Romano
ee83c69d3e
Merge pull request #14899 from samcake/brownBis
Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.
2019-02-12 13:54:09 -08:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
Sam Gateau
db30857b87 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 13:21:34 -08:00
Sam Gateau
9ff9117a34
Merge pull request #14811 from jherico/feature/quest_frame_player
Case 20884: Quest frame player and Oculus libraries
2019-02-06 13:15:39 -08:00
Sam Gateau
35491bf5b0 Multisampling works in 4.1 2019-02-06 00:05:17 -08:00
Sam Gateau
893bbe3a37 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-05 18:02:09 -08:00
Brad Davis
b1eb0b0a46 GPU tweaks 2019-01-30 16:23:21 -08:00
Sam Gateau
e39a6b5a7d Merging with master 2019-01-28 17:58:17 -08:00
Brad Davis
1d93b6ada0 Support gpu timing on systems with disjoint timer extension 2019-01-28 15:52:21 -08:00
Brad Davis
81a7fa17bf PR feedback 2019-01-25 11:14:40 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Brad Davis
6fb869126e GPU state cleanup 2019-01-22 10:37:08 -08:00
Sam Gateau
f9891775fc Enabling msaa framebuffer and testing for forward 2019-01-21 23:07:59 -08:00
Sam Gateau
79cad36c58 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-12-08 19:14:21 -08:00
Sam Gateau
50fcd7f40a trying... 2018-12-06 22:45:44 -08:00
Sam Gondelman
4d621ba61c Merge branch 'master' into splash 2018-11-27 16:01:07 -08:00
SamGondelman
1f354f813c rework shader pre-compilation 2018-11-27 14:38:02 -08:00
SamGondelman
0fccb4c73c move to batch, try to use static 2018-11-17 01:45:16 -08:00
SamGondelman
cbe5814c64 shader compilation prototype 2018-11-16 15:18:56 -08:00
Olivier Prat
0401858129 Cleaned up do_draw in GLESBackend 2018-11-15 18:34:41 +01:00
Olivier Prat
4e89e9ed2a Fixed draw / do_draw in GLBackends 2018-11-09 09:58:17 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
John Conklin II
1f06c87580
Merge pull request #14096 from Zvork/mipgen
Added generateTextureMipsWithPipeline function in gpu::Batch
2018-10-18 16:06:28 -07:00
Olivier Prat
6abffceb43 Mip generation texture slot is higher and doesn't interfere anymore 2018-10-16 09:39:32 +02:00
Clement
0634efbde9 CR 2018-10-09 12:11:55 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Olivier Prat
6fcd63ed64 Improved acnee issues 2018-10-02 15:08:39 +02:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Sam Gateau
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
Olivier Prat
9cd963af95 Added generateTextureMipsWithPipeline function in batch 2018-09-27 10:26:51 +02:00
Olivier Prat
acab748f57 Merge with master 2018-09-17 14:29:54 +02:00
Sam Gateau
986dece4ec Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood 2018-09-14 20:24:22 -07:00
Brad Davis
d92c62c742 Make android use the existing shared pointers 2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1 PR feedback 2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a More shared pointer deduplication 2018-09-12 15:04:35 -07:00
Brad Davis
9a435cdca2 Reduce needless smart pointer duplication 2018-09-12 15:04:35 -07:00
sam gateau
8c7781a6d4 use the std::chrono duration the way it should be 2018-09-11 15:57:57 -07:00
sam gateau
77586933c8 Merge and fix the default _value of GLquery so it is 0, not broken 2018-09-11 11:43:14 -07:00
sam gateau
840c8c95fd cleaning the code and comments 2018-09-11 09:34:42 -07:00
Olivier Prat
f12cd2e55a Merged with master 2018-09-11 10:19:40 +02:00
Sam Gateau
5e76a0c6d7 changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp 2018-09-10 22:55:12 -07:00