Commit graph

104 commits

Author SHA1 Message Date
samcake
afcb5b8557 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-10-03 10:17:46 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Brad Davis
42e28fa010 Fix crash in initializing texture transfer thread 2016-09-30 15:48:10 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
Brad Davis
f73cd1d65e Merge branch 'RC-21' back into master
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:58:13 -07:00
Brad Davis
31fb395c27 Add support for disabling incremental texture transfers
Conflicts:
	libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
2016-09-28 09:56:50 -07:00
Brad Davis
7361b9a166 Add support for disabling incremental texture transfers 2016-09-28 09:23:15 -07:00
Brad Hefta-Gaub
b5de603921 runtime disabling of sparse textures on less than 4 core systems 2016-09-27 10:32:56 -07:00
Brad Davis
5a91116c06 Fix debug build, fix typo in available texture memory calculation 2016-09-23 12:05:13 -07:00
Brad Davis
e6f23d6ffd Disable sparse textures on non-Windows systems 2016-09-23 12:05:12 -07:00
Brad Davis
ba3abc7b51 Fix warnings 2016-09-23 12:05:12 -07:00
Brad Davis
ab8a67e84d Code review comments 2016-09-23 12:05:11 -07:00
Brad Davis
74a3d7fcb9 Flush executed commands on the transfer thread 2016-09-23 12:05:10 -07:00
Brad Davis
44a549317e Reduce number of texture transfers per clientWait, process smaller textures first 2016-09-23 12:05:09 -07:00
Brad Davis
bca9da48fc Fix warnings 2016-09-23 12:05:08 -07:00
Brad Davis
c52de6c685 Fixing mip deallocation 2016-09-23 12:05:06 -07:00
Brad Davis
cfa5376eff Straight up bug 2016-09-23 12:05:05 -07:00
Brad Davis
28bb82c8a3 Force all sparse allocation and deallocation onto one thread / context 2016-09-23 12:05:02 -07:00
Brad Davis
255e9e6435 Add support for executing arbitrary commands on the texture transfer thread 2016-09-23 12:05:01 -07:00
Brad Davis
ee476a6048 GLTextures store the source for easier debugging 2016-09-23 12:05:01 -07:00
Brad Davis
fa23fa7b2d Working on cubemap mip bug 2016-09-23 12:04:55 -07:00
Brad Davis
ffbddd2d0f Disable sparse textures on cubemaps 2016-09-23 12:04:55 -07:00
Brad Davis
88bbb2faa8 Fix cubemap mips by overcommiting 2016-09-23 12:04:54 -07:00
Brad Davis
5734332150 Fix sparse texture deallocation 2016-09-23 12:04:53 -07:00
Brad Davis
64cb45240d Fix invalid page size for non-sparse textures 2016-09-23 12:04:52 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
Brad Davis
74481b3c1f Re-enable threaded texture transfer 2016-09-23 12:04:51 -07:00
Brad Davis
50233f6ffb Don't re-report texture memory usage until the returned value changes 2016-09-23 12:04:50 -07:00
Brad Davis
12de36a534 Check the total GPU memory usage from the card as well as our computed memory usage 2016-09-23 12:04:49 -07:00
Brad Davis
26a06b2914 Removing invalid comments 2016-09-23 12:04:48 -07:00
Brad Davis
70ec9783fa Only use sparse allocation for supported sizes / formats 2016-09-23 12:04:48 -07:00
Brad Davis
f9857c7ac4 Disable threaded texture transfers 2016-09-23 12:04:47 -07:00
Brad Davis
07ccbc6f82 Fixing warnings 2016-09-23 12:04:46 -07:00
Brad Davis
2b5ed86a62 Fixing warnings 2016-09-23 12:04:45 -07:00
Brad Davis
151df32519 Check sparse texture support before enabling 2016-09-23 12:04:44 -07:00
Brad Davis
a55669b83e Only enable sparse textures by env variable 2016-09-23 12:04:44 -07:00
Brad Davis
93b0364f73 Working on sparse stability 2016-09-23 12:04:43 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Brad Davis
017181f020 Remove magic numbers, ensure proper buffer size for page transfers 2016-09-09 09:46:54 -07:00
Brad Davis
27ddd39a22 PR comments 2016-09-09 09:30:38 -07:00
Brad Davis
a13450b36f Fix ubuntu warning 2016-09-08 22:25:04 -07:00
Brad Davis
e03b0b5825 Cleanup dead code 2016-09-08 22:19:16 -07:00
Brad Davis
a9ba92f16c Fix alignment of small pages 2016-09-08 22:19:15 -07:00
Brad Davis
f18b8f80fe Sparse texture transfers
Conflicts:
	libraries/gpu-gl/src/gpu/gl/GLTextureTransfer.cpp
2016-09-08 22:19:15 -07:00
Brad Davis
2c8b795c5f Fix incorrect fence delete 2016-09-02 11:26:21 -07:00
Brad Hefta-Gaub
8ec5798b7a Merge pull request #8548 from samcake/blue
Exposing GPU & Batch running time to Engine gpu jobs
2016-09-02 09:31:09 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00