51321 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	a2269f488f	Add some testing / validation for KTX	2017-02-22 13:29:09 -08:00
Brad Davis	c6b72dfe3c	Make memory storage mutable	2017-02-22 13:29:08 -08:00
samcake	b40e4d4e85	Merge pull request #9727 from zzmp/fix/ktx-noexcept ... macro NOEXCEPT for ktx on msvc	2017-02-22 13:07:08 -08:00
Zach Pomerantz	748d7c0ce4	macro NOEXCEPT for ktx on msvc	2017-02-22 15:06:01 -05:00
Brad Davis	3a0e13387d	Merge pull request #9716 from zzmp/fix/ubuntu ... Compile interface in Ubuntu	2017-02-21 11:54:37 -08:00
Zach Pomerantz	be4a9dcd5a	clear buffer without rref	2017-02-21 14:50:12 -05:00
Zach Pomerantz	666be6912b	fix KTX gcc errors	2017-02-21 14:46:25 -05:00
Brad Davis	7a21466b68	Merge remote-tracking branch 'sam/texmex' into smarter_textures	2017-02-21 10:50:34 -08:00
samcake	5e307f247e	Add support for the R8 textures	2017-02-21 10:46:49 -08:00
Brad Davis	3633fb8f7c	Merge pull request #9711 from samcake/texmex ... Smarter_textures branch: adding support for cube maps with KTX	2017-02-21 10:38:00 -08:00
samcake	ba54b5ce11	Rebasing with current upstream	2017-02-21 10:07:42 -08:00
samcake	bd12331846	Merge pull request #9708 from jherico/bar ... Adding new storage backing for gpu::Texture, moving mip format into storage abstraction	2017-02-21 09:33:07 -08:00
sam	e5c2f6f651	enabled the usage and cube map with KTX correctly	2017-02-21 01:28:13 -08:00
sam	9c93de3704	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into texmex	2017-02-20 20:25:27 -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
Brad Davis	07506b0078	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-19 14:00:52 -08:00
Brad Hefta-Gaub	fa0749b494	Merge pull request #9696 from ctrlaltdavid/21168 ... Add finger painting script	2017-02-19 11:37:25 -08:00
David Rowe	71ba38afb0	Process controller and script updates only when finger painting is on	2017-02-18 21:28:30 +13:00
David Rowe	05c63e16ca	Send messages local only	2017-02-18 20:40:27 +13:00
David Rowe	692fa52aca	Disable drawing pointer lasers while painting	2017-02-18 15:21:48 +13:00
sam	b6f778633e	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into texmex	2017-02-17 18:05:27 -08:00
David Rowe	2c02b42c96	Finger paint button icon files	2017-02-18 14:21:54 +13:00
Chris Collins	ec07969c0b	Merge pull request #9703 from kunalgosar/logDisplayMode ... Logging HMD/Desktop Transitions	2017-02-17 17:07:02 -08:00
David Rowe	0689557ba5	Draw smoother lines	2017-02-18 13:39:59 +13:00
David Rowe	777a0b51c1	Ignore spurious finger tip position values	2017-02-18 13:35:16 +13:00
David Rowe	784009a9fa	Merge branch 'master' into 21168	2017-02-18 13:20:39 +13:00
samcake	43d805c1c8	Merging	2017-02-17 16:09:53 -08:00
samcake	f7c2bf3bb3	Merge pull request #9704 from jherico/smarter_textures ... Additional fix to new storage	2017-02-17 16:06:16 -08:00
Seth Alves	f6bd21c483	Merge pull request #9694 from hyperlogic/feature/toolbar-tablet-switcheroo ... By default, tablet icons will display on the toolbar in desktop mode.	2017-02-17 15:07:17 -08:00
Brad Davis	6c03927b97	Additional fix to new storage	2017-02-17 13:53:27 -08:00
samcake	6882832abd	Merge pull request #9702 from jherico/smarter_textures ... Updates to texture managment	2017-02-17 13:40:37 -08:00
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -08:00
Brad Davis	61ce66a039	Switching texture backing to opaque storage type	2017-02-17 13:03:03 -08:00
Brad Davis	eafe0a04d5	Fix transfer buffering	2017-02-17 13:00:38 -08:00
Brad Davis	285222d490	Add view storage	2017-02-17 12:49:55 -08:00
Brad Davis	3ed051317b	Merge pull request #9700 from samcake/brown ... FIx creationg issue , need a usageType at creation	2017-02-17 12:45:43 -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
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Brad Davis	d1b91cb436	Adding abstracted storage for in-memory or file backed data	2017-02-17 10:13:08 -08:00
Anthony J. Thibault	e4076e6244	warning fixes	2017-02-17 09:45:13 -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
samcake	cf9fc17c4d	Starting to work on the writer side	2017-02-17 07:54:14 -08:00
samcake	894f1b8e66	DOne with the parsing side of things	2017-02-17 07:54:13 -08:00
sam	115251542d	Adding the ktx library	2017-02-17 07:54:12 -08:00