Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-20 14:24:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86988 commits 6 branches 1 tag 1.1 GiB
Commit graph

481 commits

Author SHA1 Message Date
samcake
9867b479fd APplying review feedback 2018-02-01 13:12:28 -08:00
samcake
fd501cf3af Addressing review comments 2018-02-01 10:37:54 -08:00
samcake
f044cf76d6 add the count of compilations of shaders to avoid recompiling them if ot needed 2018-01-30 18:31:30 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10: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
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00
Olivier Prat
72ef716b13 Fixed warnings on Mac and Ubuntu 2017-12-21 09:52:06 +01:00
Olivier Prat
0d34569b1a Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-21 08:22:35 +01:00
Olivier Prat
bd666406f4 Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends 2017-12-19 14:17:17 +01:00
Sam Gondelman
6990dda48d cr and cleanup 2017-12-17 16:11:55 -08:00
SamGondelman
3ae52c0e0e clear all _cacheFiles on recycle 2017-12-15 17:52:48 -08:00
Olivier Prat
4abc428518 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-14 17:57:47 +01:00
Olivier Prat
5ad69afa8a Added support for INT_2_10_10_10_REV format 2017-12-14 14:18:56 +01:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm 
Cascaded Shadow Maps and bug fix
 2017-12-14 00:32:43 +07:00
SamGondelman
ae625306ff remove getDedicatedMemory 2017-12-11 14:54:29 -08:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
Olivier Prat
ac0e816f8c Cascade selection working on shadow but not in Luci debug mode 2017-11-13 18:42:34 +01:00
Olivier Prat
7011fd3731 Removed Mac and Ubuntu warnings 2017-10-23 15:46:11 +02: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
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
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
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
dbeb4e9b27 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-11 15:25:58 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
samcake
e70f261de4 Adding the full code path, starting debugging the problems in hmd, 2017-09-05 18:09:46 -07:00
samcake
800e4cb4d7 Messing around with the velocity buffer 2017-08-16 18:29:59 -07:00
samcake
2f0eee5e4a introducing the Velocity buffer pass generation 2017-08-15 18:11:23 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Seth Alves
6f9460162d avoid calling a pure virtual function from GLBackend dtor 2017-08-06 12:47:45 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Olivier Prat
10a6ad2ac9 Added 3 more texture coord vec4f stream attributes 2017-07-18 10:58:49 +02:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +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
Brad Davis
416852c0cd Fix warnings about creating QObjects with parents in different thread 2017-06-23 10:19:16 -07: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
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Zach Fox
0d86d4f0cb It's working! 2017-06-13 14:30:32 -07:00
Sam Cake
f4ed635725 Fix bug in clearFramebuffer with Stencil Buffer 2017-06-12 22:59:42 -07:00
Sam Cake
f973f7b5e3 Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend 2017-06-12 21:25:27 -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
Sam Cake
d19956f93c Fixing warnings 2017-05-31 22:02:47 -07:00
samcake
f2f4ad28e8 removing comments not needed anymore 2017-05-23 14:16:42 -07:00
samcake
2be1e36c47 fixing the gl41 bug 2017-05-23 14:14:45 -07:00
samcake
542ec3dc46 More clean up per review request 2017-05-23 11:36:06 -07:00
Sam Cake
2301954d62 fixing the Populated metric 2017-05-22 23:40:23 -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
Brad Davis
afee753570 Prevent ping-ponging of texture quality when oversubscribed 2017-05-22 09:52: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
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
Atlante45
a8b1a29a4a Add support for BC7 compression 2017-05-18 13:11:41 -07:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
Brad Davis
ee1fd69316 Fixing crash in texture transfer logic, again 2017-05-09 21:24:58 -07:00
Brad Hefta-Gaub
d52daf3445 Merge pull request #10378 from samcake/orange 
Adding a test to protect Uniform Buffer binding at wrong slot
 2017-05-08 11:16:56 -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
10289f5423 Format non compressed normal maps to new format. 2017-05-04 10:33:34 -07:00
samcake
389d9405f9 Showing the comments 2017-05-04 10:18:14 -07:00
samcake
3f977a6743 Add a simple check on the uniform buffer slot to make sure it s valid 2017-05-04 10:16:33 -07:00
samcake
26441dbf2f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-03 14:54:11 -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
c583ffbac4 Clean up names and comments 2017-05-03 11:30:09 -07:00
samcake
84305c2049 Fixing the by region update of the compressed texture to match the 4 x 4 tiles alignment 2017-05-02 17:30:31 -07:00
samcake
0ecf599267 Adressing the warning 2017-05-02 17:19:22 -07:00
samcake
dc50db7ee5 One more warning from gcc 2017-05-02 16:27:28 -07:00
samcake
41f0b1682e Fixing warnings too 2017-05-02 14:45:41 -07:00
samcake
32d675c82b Clean up the new code and adress review comments 2017-05-02 11:46:51 -07:00
Sam Cake
54ace01cd6 Factorizing the code on both 45 and 41 backend 2017-05-02 00:32:32 -07:00
samcake
8b62fad85e TRying to test with sysmem and still doesn;t work 2017-05-01 18:19:07 -07:00
Brad Davis
f81d01f179 Prevent possible crash in texture buffering thread 2017-05-01 14:13:59 -07:00
Sam Cake
3abd9f21e8 Debugging without understanding... 2017-05-01 13:50:19 -07:00
samcake
04895864b5 Factorizing the code... 2017-04-28 17:34:15 -07:00
samcake
bfe8bc7593 Adding the 45 codepath for debug 2017-04-28 16:52:43 -07:00
samcake
d0fa8fe887 Debuging the bad transfers... 2017-04-28 12:26:44 -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
samcake
69a90d6f86 work in progress 2017-04-27 11:24:09 -07:00
Sam Cake
d99f635880 still finding a good implementation for the compressed texel copy 2017-04-27 02:08:48 -07:00
Sam Cake
63c5eea26a merging with the new master 2017-04-26 22:39:46 -07:00
Brad Davis
7be40a48a1 Merge branch 'master' into fix_stored_size 2017-04-26 19:08:04 -07:00
samcake
4f8f3a8656 debugging the mip not beeing copied correctly on 4.1 2017-04-26 18:50:28 -07:00
Brad Davis
fa0fb11329 Remove uneeded memory to memory copy for mip transfers 2017-04-26 17:14:39 -07:00
Ryan Huffman
4395cd7ee1 Update hasPendingTransfers to not touch _pendingTransfers 2017-04-26 16:31:42 -07:00
Ryan Huffman
f509403b25 Update prioritization of memory pressure states 2017-04-26 16:31:42 -07:00
Ryan Huffman
7bb6010149 Fixup targetAllocatedMip inside gl textures 2017-04-26 15:09:26 -07:00
Ryan Huffman
1bd95ee19f Remove didQueueTransfer check from populateTransferQueue 2017-04-26 15:09:26 -07:00
Ryan Huffman
6a0474934c Fixup variabletexture ctors 2017-04-26 15:09:26 -07:00
Ryan Huffman
a71d246e75 Replace canPopulate with _minAllocatedMip 2017-04-26 15:09:26 -07:00
Ryan Huffman
b9ec573c8b Update gl41 an gl45 texture backends to take into account min avail mip 2017-04-26 11:21:43 -07:00
Ryan Huffman
4d48cb2e80 Remove extraneous glTextureParameteri logging 2017-04-26 10:49:23 -07:00
Ryan Huffman
f5bb42b19f Remove request of mip from GL45BackendVariableTexture 2017-04-26 10:49:23 -07:00
Ryan Huffman
65d30d1d0b Remove lowestRequestMip from gltexture 2017-04-26 10:49:23 -07:00
Ryan Huffman
51ee058c0b Update GLTexture to not promote if we can't populate 2017-04-26 10:49:23 -07:00
Ryan Huffman
382fe5d38d Update gpu backend to only transfer if it can populate 2017-04-26 10:49:23 -07:00
Ryan Huffman
6e307dd6eb Remove debug logging 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
970be9d2c5 Add check for canPopulate to gpu backend 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
b2ff0a711e Replace canPromoteAndPopulate with multiple function calls 2017-04-26 10:48:24 -07:00
Ryan Huffman
7cab70deba Remove gl error logging 2017-04-26 10:48:24 -07:00
Ryan Huffman
d5f1e6fb37 Adjust handling of requested mips in gl backend 2017-04-26 10:48:24 -07:00
Ryan Huffman
472c888529 Fix handling of failed 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
20f4d14e07 Add compressed KTX size evaluation 2017-04-26 10:48:23 -07:00
Ryan Huffman
ab7099b3eb Add loading of lower mips to NetworkTexture 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
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
1cc86b7203 Fix build error 2017-04-25 15:56:23 -07:00
Atlante45
77d8bf20a7 Fix warnings 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
samcake
fe7cec1734 Testing on windows running 4.1 backend, all good 2017-04-25 12:04:12 -07:00
samcake
dff3a3bb34 fixing the mac crash 2017-04-25 11:34:01 -07:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
Brad Davis
472835d65c Port fix from master 2017-04-19 11:22:20 -07:00
Brad Davis
bccc06d2fe Fix resource texture memory usage tracking 2017-04-19 10:35:19 -07:00
Brad Davis
2a2102c7fe Recompute memory pressure state after each promote / demote call 2017-04-18 15:12:34 -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
bb15b8c701 ANd fixing the gl41 rendering 2017-04-14 00:46:41 -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
samcake
c3c73b209a Fixing the bad rendering of the instanced primitives on 4.1 2017-04-03 11:49:00 -07:00
samcake
467ea787c6 Adress Seth's review 2017-03-31 14:54:00 -07:00
samcake
c8970dd704 Fixing the warning on windows 2017-03-31 11:34:03 -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
47e9668b8f improving the gl41 backend to mimic the gl45 2017-03-30 17:59:59 -07:00
samcake
25edb44b75 Fix the problem with the cursor and scattering, 2017-03-30 15:15:14 -07:00
Sam Cake
1c9bc2d71e Trying to debug the crash on gl4.1 2017-03-29 23:28:06 -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