Commit graph

477 commits

Author SHA1 Message Date
samcake
6f7f949343 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-06 09:35:48 -07: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
samcake
e6572a42e3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-05 09:31:55 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
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
sam
6f2452815c pass the visibility of the enitity to the LightPaylkoad correctly, clean up the ambient shader 2016-10-03 00:08:30 -07:00
Brad Davis
d83d3fe98e Make shader compilation from non-GPU code easier 2016-10-02 11:44:32 -07:00
sam
9a492b3a88 refining the voxelizatoion, tracking one bug where light flickers 2016-10-02 03:43:55 -07:00
samcake
918f7cd515 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-01 15:36:14 -07:00
Brad Davis
42e28fa010 Fix crash in initializing texture transfer thread 2016-09-30 15:48:10 -07:00
samcake
337fe155b7 clean up warning and merge with upstream 2016-09-30 11:01:25 -07:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07:00
samcake
21b7e9dfe8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-28 10:04:13 -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
samcake
81e0266e7e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-28 09:34:29 -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
samcake
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -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
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
samcake
3bcea4310d Fixing the vizualisation shader for world to cluster space 2016-09-10 10:41:18 -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
samcake
6a08c74463 Several experimetations without success 2016-09-07 18:39:07 -07:00
samcake
4bc8a83c08 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-02 17:51:58 -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
samcake
0c0109e427 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-09-01 15:20:34 -07:00
samcake
354cbbc927 Investigate why the disable depth Bclamp doesn't work 2016-08-31 19:14:35 -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
Brad Davis
92fa1d5776 Use stream draw for object position updates 2016-08-27 15:08:38 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Davis
95b5a23c7a Properly destroy GL programs 2016-08-26 19:04:46 -07:00
Brad Davis
7ffa212006 Don't use textures that are in the transfer pipeline 2016-08-26 19:04:24 -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
Zach Pomerantz
af915c7923 replace cube tex DSA transfer with EXT 2016-08-15 15:31:04 -07:00
Brad Davis
438205b875 Fixing last buffer flush 2016-08-12 22:29:05 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
58c7df115f Reduce API surface area, make render batches const correct 2016-08-12 22:29:01 -07:00
Brad Davis
4795ddd014 Perf test improvments (skybox support) 2016-08-12 22:28:49 -07:00
Brad Davis
9ed1a5980a Prevent the allocation of 0 size buffers 2016-08-12 22:28:47 -07:00
Brad Davis
c66ed3e009 Use weak pointers instead of references for deallocation safety 2016-08-12 22:28:44 -07:00
Brad Davis
f8690867d3 Allow plugins to query if a texture is ready to render 2016-08-12 22:28:41 -07:00
Brad Davis
0396694715 Fix initial state of view correction, plus overkill 2016-08-12 22:28:33 -07:00
Brad Davis
cbe1f6dbf5 Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD 2016-08-12 22:28:32 -07:00
Brad Davis
94fe2a8824 Fix GPU bug that could leave two uniform buffers with the same binding location 2016-08-12 22:28:32 -07:00
Brad Davis
c2509e9492 Working on draw crash bug, adding render thread trash handling 2016-08-12 22:28:27 -07:00
Brad Davis
09ddad0fe0 HMD compositing and buffer debugging 2016-08-12 22:28:26 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Bradley Austin Davis
ac743b6acb PR feedback 2016-07-26 11:55:25 -07:00
Bradley Austin Davis
3962487ee3 Fix depth state caching / resetting 2016-07-26 11:55:25 -07:00
samcake
ab26f54c91 Trying to separate the vertex format and vertex buffer assignment for GL45Backend 2016-07-22 10:58:09 -07:00
samcake
a31c76f4e1 INtroducing the GPUObject for INputFOrmat for GLBackend 2016-07-21 17:59:46 -07:00
samcake
2618741505 Merging with upstream master and updating my old PR 2016-07-21 17:59:00 -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
0f240d39b6 Actually delete textures we're not using 2016-07-18 11:21:09 -07:00
samcake
cfa51ae1f5 REmoving problematic timers for mac 2016-07-17 18:32:43 -07:00
samcake
076b8cd297 Instrumenting the GPU git status 2016-07-15 17:47:54 -07:00
samcake
22ac95d463 REvisiting the RangeTimer to measure the real gpu duration 2016-07-15 09:12:16 -07:00
samcake
89ec547161 Trying to get the gpu timer to work correctly 2016-07-14 18:20:20 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
samcake
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
0e99a4ac97 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-11 10:49:28 -07:00
samcake
37f7596183 Trying to unify the shaders with/without scattering eve more but found a scribe bug. REnder emissive and lightmap during forward pass 2016-07-08 09:04:10 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
f93a91a97f Abandon seperate vertex formats for now 2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d Fix invalid GL 4.5 calls 2016-06-28 18:56:25 -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
Brad Davis
a41de3a60d Making GL 4.5 enabled by default, adding logging 2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde Fix crash in GL45 buffer re-allocation 2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d Adding GL 4.5 backend 2016-06-28 18:55:24 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
SamGondelman
c30c2b64b2 first pass at preventing repeated compileShader error prints 2016-06-17 17:49:27 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Zach Pomerantz
fff260c2b9 Guard against zero-sized gl buffer copy 2016-05-20 09:27:50 -07:00
Brad Davis
7efcad38d2 PR feedback 2016-05-18 23:11:36 -07:00
samcake
2cc425e256 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-18 15:34:05 -07:00
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -07:00
Brad Davis
0d6b0eef59 PR feedback 2016-05-16 15:27:14 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00