885 commits

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