Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-28 05:55:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
88106 commits 76 branches 59 tags 1.2 GiB
Commit graph

1304 commits

Author SHA1 Message Date
Olivier Prat
0bbd1edc0a Fixed fluttering highlight bug by attaching only stencil when drawing outline 2017-11-07 18:26:15 +01:00
Olivier Prat
bced566510 Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo 2017-10-27 10:45:43 +02:00
Olivier Prat
ae8a9e68c8 Added debug tool to view shadow & view frustums 2017-10-25 11:58:16 +02:00
SamGondelman
046e5ca716 fix backwards HUD in mirror mode 2017-10-24 13:24:09 -07:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
Olivier Prat
049e3d47b6 Preparing for support of multiple concurrent outlines by adding mask id buffer 2017-10-13 10:23:42 +02:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Olivier Prat
db9a9e723c Merged with master 2017-10-10 12:11:23 +02:00
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
Olivier Prat
23c77d528a Merged with master with new abotProcessing in image 2017-09-25 09:48:24 +02:00
Olivier Prat
98820f720d KTX serialization / unserialization working with compressed HDR. Not sure with packed floats 2017-09-21 13:17:25 +02:00
Olivier Prat
5699dc6f42 Added KTX support of compressed HDR and HDR formats 2017-09-21 10:03:05 +02:00
Olivier Prat
5ec9c5bb45 Fixed some coding standard issues 2017-09-21 09:32:34 +02:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Olivier Prat
b8065d46ce Fixed bugs with conversion to packed floats 2017-09-13 19:15:51 +02:00
Olivier Prat
aab63bf109 Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash 2017-09-13 14:32:22 +02:00
samcake
9335acc887 Merge and a lot of rewriting the color conversion 2017-08-24 18:02:11 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Seth Alves
6e0394865e fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset 2017-07-23 08:05:09 -07:00
Olivier Prat
3316be4dea Working fade parameters through instanced draw calls 2017-07-18 17:01:17 +02:00
Olivier Prat
10a6ad2ac9 Added 3 more texture coord vec4f stream attributes 2017-07-18 10:58:49 +02:00
Sam Gateau
93963b3257 Apply the projection and deferred transform fixes found while working on spectator camera 2017-06-28 15:44:17 +02:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
samcake
4c8eec4e16 Introducing a way to prevent a frame to render in stereo accross batches 2017-06-08 17:38:26 -07:00
samcake
82d348a2ef Stencil rejection is working, and more cleaning 2017-05-31 16:46:20 -07:00
Sam Cake
32c5dac66a Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil 2017-05-31 00:55:28 -07:00
samcake
8559ed6260 Starting to add the stencil mask for hmd 2017-05-30 16:37:10 -07:00
Sam Gateau
5b0d2f32b4 Merge pull request #10458 from jherico/ktx_validation 
Add KTX validation routines
 2017-05-25 16:02:23 -07:00
Brad Davis
6490c52245 Do not allow divide by zero on assigning mip data 2017-05-24 13:02:54 -07:00
Brad Davis
191b633081 Refactor KTX defines and validation 2017-05-24 11:15:34 -07:00
samcake
653abf0ee3 brining the new counters to 4.1 2017-05-22 17:34:06 -07:00
samcake
e0487f7e04 Solving the size evaluation for compressed format 2017-05-22 16:51:54 -07:00
Brad Davis
3995f539cf Merge pull request #10500 from Atlante45/feat/bc7 
Add BC7 compression support
 2017-05-22 16:47:27 -07:00
samcake
e4f9f2935e Solving the size evaluation for compressed format 2017-05-22 15:42:18 -07:00
Sam Cake
1f090d8148 Debugging the size problem and fixing the compression size evaluation 2017-05-22 01:00:34 -07:00
samcake
56e9b1bb37 Adding the populated counter 2017-05-19 18:46:19 -07:00
samcake
c5b5aa93b1 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-19 18:13:42 -07:00
samcake
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
Ryan Huffman
26247e8653 Add check for valid mutableData in assignMipData 2017-05-19 15:00:53 -07:00
Ryan Huffman
64bf5784e6 Fix FileStorage to not close files after they are opened 
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
 2017-05-19 11:16:20 -07:00
Ryan Huffman
c36b85bb05 Add notes to KtxStorage::maybeOpenFile 2017-05-19 11:11:00 -07:00
Atlante45
a8b1a29a4a Add support for BC7 compression 2017-05-18 13:11:41 -07:00
samcake
9c154122d3 Introdicing the format factor and merging with master becasue of protocol change... 2017-05-18 13:08:13 -07:00
samcake
2c6e10fbe1 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-18 09:21:02 -07:00
Brad Hefta-Gaub
fbc32e5ba1 Merge pull request #10485 from samcake/orange 
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
 2017-05-18 08:47:58 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
samcake
b19b0007c8 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-17 13:02:37 -07:00
samcake
ab3ea65d54 Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage 2017-05-17 12:36:12 -07:00
samcake
b466964817 REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior 2017-05-16 18:21:24 -07:00
Ryan Huffman
e0212ac32b Remove _fullImageSize from ktx header 2017-05-16 15:53:07 -07:00
Ryan Huffman
bfd1274ed3 Fix progressive loading of cubemaps 
In various places we were using the KTX _imageSize as the size of the
entire mip level, when it is actually the size of the face for cubemaps.
 2017-05-16 15:12:47 -07:00
samcake
d734358290 Adding a comment for debug sake 2017-05-12 18:15:00 -07:00
samcake
5bc8e09865 Fixing the test... 2017-05-12 18:10:48 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures 
Add an internal tool for domain/model/skybox KTX texture baking
 2017-05-12 12:26:33 -07:00
Chris Collins
fd836dcd68 Merge pull request #10366 from Atlante45/feat/normal-map-compression 
Feat/normal map compression
 2017-05-05 10:03:01 -07:00
Atlante45
542923839d Change name to VEC2NU8_XY 2017-05-04 10:33:34 -07:00
Atlante45
10289f5423 Format non compressed normal maps to new format. 2017-05-04 10:33:34 -07:00
Atlante45
5e36bebc96 Store irradiance in the KTX files. 2017-05-03 19:46:17 -07:00
Sam Gateau
8507fffcc2 Merge pull request #10313 from samcake/ambient-bis 
Fixing the the mip gpu copy for compressed format texture in GL41Backend
 2017-05-03 14:50:55 -07:00
samcake
32d675c82b Clean up the new code and adress review comments 2017-05-02 11:46:51 -07:00
samcake
8240c3f761 Fixing the spam issue triggered by the external textures, removed 2 warnings 2017-04-27 18:05:52 -07:00
samcake
7c15609136 Fixing the broken texture copy (during texture streaming) for compressed format in GL41Backend 2017-04-27 17:28:10 -07:00
Ryan Huffman
d8e4604b18 Fix gpu access of ktx file not being thread-safe 2017-04-27 13:03:04 -07:00
Brad Davis
7be40a48a1 Merge branch 'master' into fix_stored_size 2017-04-26 19:08:04 -07:00
Stephen Birarda
49e7ae6dbc call image library for texture baking 2017-04-26 18:37:35 -07:00
Ryan Huffman
fee36453a3 Move hifi.minMip 2017-04-26 17:53:17 -07:00
Ryan Huffman
cb299695f4 Update imageOffset to size_t 2017-04-26 17:52:53 -07:00
Brad Davis
960c29edb7 Fix excessive copying when querying the size of a KTX backed texture 2017-04-26 17:12:48 -07:00
Ryan Huffman
47cf44dc60 Store offset to min mip kv in KtxStorage 2017-04-26 17:11:19 -07:00
Ryan Huffman
f15a34e145 Cleanup data pointer calculations in assignMipData 2017-04-26 16:31:42 -07:00
Ryan Huffman
c7ac82b4e2 Remove magic number for kv and image sizes 2017-04-26 15:09:26 -07:00
Ryan Huffman
e4e554aaea Remove dead code from Texture.h 2017-04-26 15:09:26 -07:00
Ryan Huffman
29641ba69a Fix min mip not being written to ktx correctly 2017-04-26 11:32:36 -07:00
Ryan Huffman
674e767513 Remove MipInterestListener 2017-04-26 10:49:49 -07:00
Atlante45
6fb074715e Fix alpha rendering bug 2017-04-26 10:48:57 -07:00
Stephen Birarda
3c5754282f write the source hash in ktx header in binary 2017-04-26 10:48:57 -07:00
Atlante45
927efc88f0 Fix GPUKTXPayload conflict across platforms 2017-04-26 10:48:57 -07:00
Ryan Huffman
14f8c91e23 Adjust gl45 backend to request interest in mips and keep track of min requested 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
bc6d476a4d Cleanup Texture_ktx.cpp 2017-04-26 10:48:57 -07:00
Ryan Huffman
d5f1e6fb37 Adjust handling of requested mips in gl backend 2017-04-26 10:48:24 -07:00
Ryan Huffman
841d301dec Fix build errors due to TexturePointer change 2017-04-26 10:48:24 -07:00
Ryan Huffman
cc7169b754 Add debug logging for ktx downloads 2017-04-26 10:48:24 -07:00
Ryan Huffman
ce12a216c0 I think it might be working. 2017-04-26 10:48:24 -07:00
Ryan Huffman
70eaac8d6c Add persisting of ktx min mips available to ktx cache file 2017-04-26 10:48:24 -07:00
Ryan Huffman
5594e81fe4 Improve gl backend handling of unavailable mips 2017-04-26 10:48:24 -07:00
Ryan Huffman
11751611e1 Update NetworkTexture to track current KTX download state 2017-04-26 10:48:23 -07:00
Ryan Huffman
20f4d14e07 Add compressed KTX size evaluation 2017-04-26 10:48:23 -07:00
Ryan Huffman
b21dc12cc6 Cleanup NetworkTexture ktx handling 2017-04-26 10:47:32 -07:00
Ryan Huffman
ab7099b3eb Add loading of lower mips to NetworkTexture 2017-04-26 10:47:32 -07:00
Ryan Huffman
39c3fee838 Add caching of imageOffset to ktx ImageDescriptor 2017-04-26 10:47:32 -07:00
Ryan Huffman
e9bb895bff Implement KTXStorage::assignMipData and add writing of mips to 
TextureCache
 2017-04-26 10:47:32 -07:00
Ryan Huffman
cf3dc12542 Add object labels to GL objects and add ktx min mip kv 2017-04-26 10:47:32 -07:00
Ryan Huffman
aca7ad27c6 Fix ktx dependencies 2017-04-26 10:47:32 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b Add extended ktx header/high-mip request handling to NetworkTexture 2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68 Add basic mip writing to gpu::Texture 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
9dbae4b54e CR 2017-04-25 15:56:23 -07:00
Atlante45
b98cd7355e Code cleanup 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
63e564c178 Add source hash to KTX metadata 2017-04-25 15:56:23 -07:00
Atlante45
d9a7615cc8 Add compression support for skyboxes 2017-04-25 15:56:23 -07:00
Atlante45
ae73cf4038 Add support for Grayscale and NormalMap textures 2017-04-25 15:56:23 -07:00
Atlante45
69a27d516f Fix roughness 2017-04-25 15:56:22 -07:00
Atlante45
5ceb30b69c Make sure mips are copied to memory 2017-04-25 15:56:22 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
sam gateau
733e268391 FIx the SSBO usage on amd, needed a bit more explanation on the glsl side 2017-04-21 16:17:18 -07:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Sam Cake
29545f0918 FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend 2017-04-13 23:53:56 -07:00
samcake
d41f34ce8d Adding support for the resource buffer 2017-04-12 19:07:27 -07:00
Brad Davis
b2aa3271f7 Adding support for variable allocated textures to the GL 4.1 backend 2017-04-12 15:09:20 -07:00
Brad Davis
057a9feaf1 Don't crash if KTX file is invalid 2017-04-06 10:09:57 -07:00
samcake
467ea787c6 Adress Seth's review 2017-03-31 14:54:00 -07:00
samcake
6a0c07a692 Fixing a bad counter for numFaces 2017-03-31 10:39:13 -07:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
Sam Cake
61d78bc931 BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things 2017-03-30 23:29:37 -07:00
samcake
25edb44b75 Fix the problem with the cursor and scattering, 2017-03-30 15:15:14 -07:00
samcake
5584853340 Keep on cleaning 2017-03-29 18:22:21 -07:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
samcake
a2b2e3e169 Revert "Revert "Don't hold KTX files open for longer than transfers require"" 2017-03-28 14:45:04 -07:00
samcake
08e1a2ba4c Revert "Don't hold KTX files open for longer than transfers require" 2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1 Merge pull request #10020 from jherico/ktx_refactor 
Don't hold KTX files open for longer than transfers require
 2017-03-28 14:06:02 -07:00
Bradley Austin Davis
638364497d Trying a different tactic to avoid multiple concurrent file access 2017-03-27 16:18:04 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -07:00
Andrew Meadows
fcf18cba91 render pipeline support for normalized intergers 2017-03-27 14:40:31 -07:00
Bradley Austin Davis
f764cd614b Don't hold KTX files open for longer than transfers require 2017-03-27 13:33:00 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Brad Davis
4868a1618a Add initialization to sampler stamp 2017-03-22 18:10:54 -07:00
Brad Davis
9a3686fc1a Fixing merge conflict 2017-03-22 14:55:11 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Andrew Meadows
a463013d90 Merge pull request #9960 from samcake/blue 
Fix Ambient Lighting equation
 2017-03-22 14:13:31 -07:00
Brad Davis
e60108cc8c PR comments 2017-03-21 17:26:24 -07:00
samcake
e05abf2a2f Fixing the spherical harmonics gneration 2017-03-20 16:41:21 -07:00
Seth Alves
200550aba9 ModelScriptingInterface::appendMeshes 2017-03-16 15:22:34 -07:00
Brad Davis
399270d243 Still trying to fix OSX build 2017-03-08 09:03:59 -08:00
Bradley Austin Davis
62fcd238ae Fix shared pointer usage in storage abstraction 2017-03-08 09:03:58 -08:00
sam
1b036b7225 Implement the ktx keyvalue feature for read and write and use it with gpu::Texture to store meat data required for full serialization 2017-03-07 00:58:22 -08:00
Bradley Austin Davis
9051c84b6d Fix warnings 2017-03-03 14:16:27 -08:00
Bradley Austin Davis
47087add15 Add support for fallback textures, throttling texture creation 2017-03-03 09:00:12 -08:00
Brad Davis
cd8bba47cf Add pending texture transfer size to tracked stats 2017-02-24 12:39:38 -08:00
Brad Davis
cd8f3e1b01 Prevent name collisions in KTX from causing crashes 2017-02-23 13:04:04 -08:00
samcake
48c7d17140 make sure to assign the proper mipFOrmat to the KTXStorage, and fix the glTypeSize again 2017-02-23 12:43:52 -08:00
Brad Davis
f32817beac Fix number of mips calculation 2017-02-23 10:19:20 -08:00
sam
fbb0a24c4f FIxing the bug preventing to deserialize normals, clean up the ktx usage of the storage::Storage class and cleaning up somewhat the Qt pixel formats used 2017-02-23 02:08:46 -08:00
samcake
262d7c3b79 Merging with upstream smarter_textures and Austin's pr 2017-02-22 17:54:38 -08:00
samcake
ad40e2d7d9 Trying to address the ktx serialization problem with normal, still have a bug 2017-02-22 17:16:37 -08:00
Brad Davis
62422690d0 More KTX testing, functionality 2017-02-22 15:44:06 -08:00
samcake
c2831a513b Adjusting the representation of the format in the KTX for sRGB, unfortunately not working with PicoPixel 2017-02-22 14:41:43 -08:00
samcake
9ca4926c1d Fixing the bad assignment for the srgb textures 2017-02-22 13:43:23 -08:00
Brad Davis
a2269f488f Add some testing / validation for KTX 2017-02-22 13:29:09 -08:00
samcake
5e307f247e Add support for the R8 textures 2017-02-21 10:46:49 -08:00
samcake
ba54b5ce11 Rebasing with current upstream 2017-02-21 10:07:42 -08:00
sam
e5c2f6f651 enabled the usage and cube map with KTX correctly 2017-02-21 01:28:13 -08:00
Brad Davis
27e8750b9b Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction 2017-02-19 18:11:56 -08:00
sam
b6f778633e Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into texmex 2017-02-17 18:05:27 -08:00
samcake
43d805c1c8 Merging 2017-02-17 16:09:53 -08:00
Brad Davis
6c03927b97 Additional fix to new storage 2017-02-17 13:53:27 -08:00
Brad Davis
61ce66a039 Switching texture backing to opaque storage type 2017-02-17 13:03:03 -08:00
samcake
2d7ba45667 FIx creationg issue , need a usageType at creation 2017-02-17 12:01:33 -08:00
sam
b4745657e0 progressing on io with ktx 2017-02-17 07:58:10 -08:00
sam
0d2e764bfd CLeaning the read case 2017-02-17 07:55:19 -08:00
sam
6771cc31e1 Adding the reading path 2017-02-17 07:55:18 -08:00
samcake
3f0ea1c889 Address review comments 2017-02-17 07:55:16 -08:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
sam
115251542d Adding the ktx library 2017-02-17 07:54:12 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
sam
56d1120654 progressing on io with ktx 2017-02-17 01:15:27 -08:00
sam
2ee3f05713 CLeaning the read case 2017-02-16 17:28:02 -08:00
sam
8ee5defc60 Adding the reading path 2017-02-16 16:03:55 -08:00
samcake
2f7181fb32 Address review comments 2017-02-16 13:27:16 -08:00
sam
0d28d17e40 Maybe saving the first ktx textures, testing the save pipeline 2017-02-16 02:45:53 -08:00
sam
7d5d6823cd Adding the ktx library 2017-02-15 00:54:16 -08:00
samcake
8c7ec8b0c5 Add profiling in COntext batch execution and shortcuts for trace names 2017-01-09 18:05:02 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Brad Davis
a98e49c892 Fix build errors 2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab Working on OpenGL debuggability 2016-11-29 13:15:56 -08:00
samcake
a07523ca31 Merge with Upstream 2016-11-17 18:31:05 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
Seth Alves
d097fa7982 fix polyvox memory leak 2016-11-16 14:10:50 -08:00
samcake
982664dac5 Merging with upstream 2016-11-15 18:14:25 -08:00
samcake
9267f4eaaf Fix the merge with upstream and the new stereo drawcall, fix the timer reporting on mac and fix the openGLChecker quicking on mac 2016-11-15 00:40:39 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths 
Introduce Instanced Stereo Drawcall
 2016-11-14 18:30:42 -08:00
samcake
b888af15e4 Fix merge 2016-11-14 11:15:27 -08:00
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -08:00
samcake
784a0540ed Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 10:05:03 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
Bradley Austin Davis
9e929ca629 Re-enable downsampling for non-sparse textures 2016-11-09 12:09:24 -08:00
samcake
af438ae31b Fix the buid 2016-11-07 17:56:54 -08:00
samcake
cab699464e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-07 17:31:06 -08:00
sam
bcef138545 FIx the context stats 2016-11-04 18:59:30 -07:00
samcake
f274ef1a59 Merging back with upstream and trying to fix counter for them to be more stable 2016-11-04 16:56:03 -07:00
samcake
e12040a98a Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-04 14:54:18 -07:00
samcake
76aa541d4a Adding the frame gpu and batch timer 2016-11-04 11:49:52 -07:00
samcake
3db1831841 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2016-11-04 09:59:28 -07:00
samcake
7655f906f1 Starting adding a timer for the frame 2016-11-03 19:26:30 -07:00
samcake
1086585559 fixing the test to actually capture ati correctly and add the report to the ui 2016-11-03 15:15:05 -07:00
samcake
6a39ad3b5a Prevent sparse texture on AMD gpus for now 2016-11-03 13:01:41 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
samcake
9adbb42a6c Fixing the skybox, still issues with the lights 2016-10-28 18:12:39 -07:00
samcake
9e91926426 fixing most of the rendering in 3D 2016-10-28 16:22:46 -07:00
samcake
9d2043cc3c Porting and potentially fixing the stereo drawcall, still not perfrect ork in progress 2016-10-27 17:49:10 -07:00
samcake
5bdfceebc5 BRingin back the stereo code path 2016-10-26 18:35:47 -07:00
samcake
58b81e3b0c Adding counter for the amount of memory used in texture for Framebuffers 2016-10-24 18:34:16 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
Brad Davis
62de2af944 Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -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
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
samcake
5f9c713d44 Merging with upstream after resolving some conflicts 2016-10-12 09:22:12 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
samcake
77062ac1b3 Cleaning up a missing constructor and adjusting the stride for the StrucBuffer by default + merging with upstream 2016-10-11 17:13:08 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
samcake
297907688c Fixing reveiw comments 2016-10-10 12:43:33 -07:00
samcake
621d62cdf8 Merge and fix the linux warning 2016-10-06 09:53:12 -07:00
samcake
ba88db1b14 Tried many different things to narrow down the issue of the corrupted memory, it seems to be linked to the grid dimendsions somehow, i m now forcing to reassign the frustum grid dimension on the 10th iteration which seems to fix the issue.... 2016-10-05 18:28:19 -07:00
Brad Davis
48092978e9 Fix page size usage in gpu buffers 2016-10-05 17:05:01 -07:00
samcake
e6572a42e3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-10-05 09:31:55 -07:00
samcake
6aa39ec95a Polish the debugging of the light volumes 2016-10-04 11:03:12 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09: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
9b94a025fc Refining the voxelization of the sphere in the view frustum grid 2016-09-26 18:41:53 -07:00
Brad Davis
ab8a67e84d Code review comments 2016-09-23 12:05:11 -07:00
Brad Davis
d382305174 Add fence tracking and max values tracking to gpu::Context 2016-09-23 12:05:00 -07:00
Brad Davis
82db3d5d55 Disable support for framebuffer resizing 2016-09-23 12:04:57 -07:00
Brad Davis
0953027ef3 Identify pre-generated textures 2016-09-23 12:04:56 -07:00
Brad Davis
1ff91219a8 Fix strange artifacts in skybox 2016-09-23 12:04:52 -07:00
samcake
e8c2dc10f1 best state for now 2016-09-13 14:59:23 -07:00
samcake
efc4406b47 Debugging the grid content 2016-09-12 19:46:18 -07:00
samcake
61de063b29 Developping the Light Clusters, adding visualization 2016-09-08 18:02:35 -07:00
samcake
e2a9751cf5 REmove warnings 2016-09-06 16:35:28 -07:00
samcake
1165c54f67 cleaning up the IndexedContainer in its own file and removing warnings 2016-09-06 16:24:03 -07:00
samcake
d2a15ca82c Trying to migrate to a light array instead of each individual lights 2016-09-02 17:51:35 -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
c9e18e8d90 spacing repairs in autoscribe_shader_lib 2016-08-31 11:59:51 -07:00
samcake
47aaed491d Merging with Blue 2016-08-30 17:06:29 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
samcake
3755a3fc32 Add batch timing information vs gpu 2016-08-29 17:54:17 -07:00
samcake
9669234f9c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-25 12:36:01 -07:00
Brad Hefta-Gaub
99ea180f09 Merge pull request #8495 from AndrewMeadows/faster-spherical-harmonics 
speed up spherical harmonics calculation with minimal error
 2016-08-24 15:57:42 -07:00
Brad Hefta-Gaub
0397c6b6ca Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data 
workaround bad FBXMesh data rather than assert
 2016-08-22 14:21:48 -07:00
samcake
44c6637160 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-22 10:32:06 -07:00
Andrew Meadows
d2d905fc86 speed up SH calculation with minimal error 2016-08-22 10:21:22 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
samcake
6a076bcee4 PRoviding a fix for the macOS build 2016-08-19 11:09:12 -07:00
Andrew Meadows
5b5ed220bc add BufferView::Iterator operator<() and friend 2016-08-19 10:26:47 -07:00
Zach Pomerantz
813fefd599 reimplement buffer get for (c)end 2016-08-18 11:26:25 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -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
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
82081d7d57 Address vsync weirdness 2016-08-12 22:28:58 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00
Bradley Austin Davis
f1fd8ac6e4 Fix OSX Oculus issues 2016-08-12 22:28:51 -07:00
Brad Davis
7fb1315945 Properly track the max mip 2016-08-12 22:28:48 -07:00
Brad Davis
c66ed3e009 Use weak pointers instead of references for deallocation safety 2016-08-12 22:28:44 -07:00
Brad Davis
5210dee155 Cleanup of GPU lib, breaking up Resource.h 2016-08-12 22:28:43 -07:00
Brad Davis
c6848a1b55 Remove static allocation debugger 2016-08-12 22:28:37 -07:00
Brad Davis
02b4873ab0 Use move constructor for building buffer shadow updates 2016-08-12 22:28:28 -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
894d29bb29 Fixing flicking in instance based objects 2016-08-12 22:28:24 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Bradley Austin Davis
66cc9136eb Working on build 2016-08-12 22:18:48 -07:00
Bradley Austin Davis
a0cc6f8817 Better buffer updating 2016-08-12 22:18:37 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
SamGondelman
e35d453b37 ...missing space 2016-08-10 10:36:37 -07:00
SamGondelman
9e20d92241 CR changes 2016-08-10 10:35:18 -07:00
SamGondelman
5a4d15dd5b fix warning 2016-08-09 14:02:42 -07:00
Andrew Meadows
85d87fe13f Merge pull request #8218 from huffman/feat/load-improvements 
Speed up gamma correction in cube map processing
 2016-08-09 11:10:36 -07:00
Ryan Huffman
b800aa793d Fix gamma correction adjusting uchar to float when unnecessary 2016-08-08 15:45:05 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Bradley Austin Davis
54a7265be8 Removing empty file, because jenkins 2016-07-26 16:32:56 -07:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Bradley Austin Davis
a455f3a435 Add frame concept to gpu library 2016-07-26 15:25:36 -07:00
samcake
3a7c33165b add missing include ? 2016-07-23 20:20:50 -07:00
samcake
2618741505 Merging with upstream master and updating my old PR 2016-07-21 17:59:00 -07:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -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
f6671b34fa Fix the transformation problem for rendering the mini mirror (scattering is still screwed though) 2016-07-13 18:26:53 -07:00
samcake
219b41e813 Fix the mini mirror perf issue and improve the debugDeferredLighting script 2016-07-13 17:37:35 -07:00
samcake
cde17ecaab Clenaing the rendering and the framebuffer allocations 2016-07-12 14:34:54 -07:00
samcake
0e99a4ac97 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-11 10:49:28 -07:00
Ryan Huffman
611779b58b Improve gamma correction implementation in cube map processing 2016-07-08 16:25:50 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
Brad Davis
790f74da1d Support geometry shaders 2016-07-07 13:36:47 -07:00
Brad Davis
b73fe24848 PR feedback 2016-07-07 11:12:55 -07:00
Brad Davis
eff1c65388 Reduce the number of temporary objects in batch commands 2016-07-07 11:12:55 -07:00
Brad Davis
721cd79b57 Aggressive batch pre-allocation 2016-07-07 11:12:54 -07:00
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
b16812aa4d Adding GL 4.5 backend 2016-06-28 18:55:24 -07:00
samcake
90e5697940 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-22 09:06:47 -07:00
SamGondelman
34d18da4e4 remove mutable 2016-06-20 11:11:54 -07:00
SamGondelman
c30c2b64b2 first pass at preventing repeated compileShader error prints 2016-06-17 17:49:27 -07:00
samcake
37a6d29406 Finally clean the lighting pass for global and local lights, split it into global and locals and make it work with the stereo single drawcall 2016-06-17 17:19:49 -07:00
SamGondelman
f32e29ac2d small changes 2016-06-10 13:46:02 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00
SamGondelman
8cccd5416a try to fix mac errors 2016-06-09 16:10:27 -07:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
samcake
3fe9b67e45 FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -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
Zach Pomerantz
a55179101e Fix invalidFormat check 2016-05-18 15:11:29 -07:00
Zach Pomerantz
ca364c2227 Fix vao usage 2016-05-18 14:58:12 -07:00
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -07:00
Zach Pomerantz
854c6d839c Style nit 2016-05-18 14:01:02 -07:00
Zach Pomerantz
804e6a805e Simplify sync 2016-05-18 14:01:02 -07:00
Zach Pomerantz
e6664d9441 Initialize buffers 2016-05-18 14:01:02 -07:00
Zach Pomerantz
92e26169f6 Move define for vao to one header 2016-05-18 14:01:02 -07:00
Zach Pomerantz
df3fb2a0e8 Guard buffer copy on size 2016-05-18 10:56:48 -07:00
Zach Pomerantz
e8c86a3fe4 Fix warnings in updateInput 2016-05-18 10:53:12 -07:00
Zach Pomerantz
281c6dc82b Always return input from sync 2016-05-18 10:52:58 -07:00
samcake
c627a555bf Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-16 16:27:51 -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
Brad Davis
84f4945840 Fix sampler mode lookup 2016-05-15 13:05:50 -07:00
Brad Davis
e8bd97c761 Fix GPU buffer memory statistics 2016-05-14 08:28:51 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Davis
eb84459f03 Support partial CPU->GPU buffer transfers 2016-05-14 08:28:50 -07:00
samcake
d5a9d39edf Defaulting the color formats used in the rendering pipeline to sRGB 2016-05-11 18:01:19 -07:00
samcake
c6a081fb46 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-05-11 16:56:37 -07:00
Geenz
043fe3508a Add SRGBA color format. 2016-04-30 15:47:42 -04:00
samcake
fa28286274 Merge with master and include fix to debus eception, still crashing on particular drawcalls when in stereo? 2016-04-26 15:26:56 -07:00
Geenz
d6ee569963 Add sRGB conversions to shaders. 2016-04-25 23:52:33 -04:00
Geenz
97931d96b8 Move sRGB calcs to ColorUtils 
And start consolidating any conversions with calls into ColorUtils.
 2016-04-25 12:59:16 -04:00
Geenz
ed9c0dd74d Apply the correct sRGB conversions. 
sRGB does not use a gamma curve of 2.2 - instead it uses a piece-wise
gamma curve that 2.2 is approximate of.  This will cause very subtle
color differences between proper sRGB and "approximate" sRGB -
differences that are noticeable nonetheless.
 2016-04-25 02:35:26 -04:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request #7745 from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request #7636 from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Brad Davis
33ec73bfd8 PR comments 2016-04-21 15:11:11 -07:00
Brad Davis
ef466a64bf Add GPUIdent logic for determining video memory 2016-04-21 14:46:13 -07:00
Brad Davis
6c30194916 Support lowering the minimum mip of a texture at runtime 2016-04-21 14:46:12 -07:00