Commit graph

395 commits

Author SHA1 Message Date
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
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
samcake
f050cc31f2 Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar 2017-02-27 13:32:24 -08:00
Brad Davis
594fe9b1be Use hashes of URLs for filenames, due to length constraints 2017-02-23 22:01:53 -08:00
Brad Davis
cd8f3e1b01 Prevent name collisions in KTX from causing crashes 2017-02-23 13:04:04 -08:00
Brad Davis
a168bbf2dd Fix ktx file location, unique->shared pointer 2017-02-23 10:26:59 -08:00
sam
d7cb479dbe clean the clean ups 2017-02-23 02:17:18 -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
bbded6aa51 fix issues while testing the ktxStorage 2017-02-22 19:07:01 -08:00
samcake
e8835b34f4 fix issues while testing the ktxStorage 2017-02-22 19:05:20 -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
055db531b1 Update 'caching' of textures to KTX file backing 2017-02-22 15:59:05 -08:00
Brad Davis
61ba2dd11e Disable texture cache processing for now 2017-02-22 13:29:10 -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
sam
b502b1e200 assigning the names of source to the texture 2017-02-20 19:40:39 -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
samcake
e6c6cd2825 cleaner unserialization 2017-02-17 12:24:04 -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
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
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
samcake
e11d10f5d4 Reparing broken normals and also fixing the ambient lighting bug 2017-02-08 16:56:59 -08:00
samcake
267d553c26 Cleaning comments and pixel format assignments 2017-02-08 11:42:23 -08:00
samcake
a137659a35 Cleaning up pr for simpler merge 2017-02-08 11:13:55 -08:00
samcake
7b49f548ed trying to remove the 24bits formats 2017-02-07 18:06:49 -08:00
samcake
feb36b8dbf Merge branch 'purple' of https://github.com/samcake/hifi into blue 2017-02-06 11:56:45 -08:00
samcake
9fd1d5114c Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-02-06 10:16:41 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
samcake
27dab5c4ba COmbining more intrumentation, mip generation on cpu and an improved blit for the derez case 2017-02-03 12:03:59 -08:00
sam
c4ec0cc069 fixing a bad cDebug 2017-02-02 22:09:52 -08:00
samcake
b440ccad28 Improving the IMage class 2017-02-02 17:53:48 -08:00
samcake
446aaf3bce Turn off cpu mip map to add instrumentation to master 2017-02-02 11:58:02 -08:00
sam
569378bdeb REcompiling for windows... 2017-02-02 01:57:43 -08:00
sam
387621e586 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 22:01:39 -08:00
sam
3aa239b004 More instrumentation during texture load 2017-02-01 22:00:03 -08:00
samcake
3108360094 Merge branch 'blue' of https://github.com/samcake/hifi into purple 2017-02-01 16:36:40 -08:00
samcake
6bdf50f2db moving mip map gen to cpu 2017-02-01 15:16:37 -08:00
samcake
edcba1b7c5 Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-02-01 10:12:47 -08:00
samcake
586db3405a Merge branch 'master' of https://github.com/highfidelity/hifi into purple 2017-01-30 22:08:51 -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