Commit graph

315 commits

Author SHA1 Message Date
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