1284 commits

Author	SHA1	Message	Date
Stephen Birarda	d7ad20e476	fix gpu CMakeLists for Android	2015-01-29 15:01:15 -08:00
ZappoMan	6821f31f14	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing ... Conflicts: libraries/gpu/src/gpu/GLBackend.cpp	2015-01-28 10:46:30 -08:00
Sam Gateau	4592bdcb4f	fixes after review by Brad	2015-01-27 15:42:56 -08:00
Sam Gateau	80784a7a33	fixing a bug in texture storage when accessing mip #0	2015-01-22 16:57:33 -08:00
Sam Gateau	49dde269a6	experimenting with linear space vs srgb space	2015-01-22 16:27:17 -08:00
dev	03a5c398ec	splitting the GLBackend.cpp in several files and fixing the build for mac	2015-01-22 12:38:24 -08:00
Sam Gateau	1e84f260a9	Removing gl calls for texture from TextureCache	2015-01-21 16:53:35 -08:00
Sam Gateau	d19bfa69f2	Even more gpu::Texture in the model rnedering	2015-01-21 10:07:10 -08:00
Sam Gateau	4302db109f	First take at using the gpu::Texture in the Model rendering instead of the previous pass with raw glTexture	2015-01-20 16:02:26 -08:00
ZappoMan	41c039f283	Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing	2015-01-19 13:34:28 -08:00
ZappoMan	bddb7856af	more work	2015-01-19 13:34:09 -08:00
Sam Gateau	6b55b4ff82	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -08:00
ZappoMan	439a1c0495	solid cube now streamizing	2015-01-15 18:46:44 -08:00
dev	d7ad5a35d6	fixes for glsl mac	2015-01-13 18:24:32 -08:00
Sam Gateau	979d50f7d8	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
Brad Hefta-Gaub	fb15b0f2a7	Merge pull request #3992 from samcake/temp0 ... Add the BufferView class in gpu::Resource	2014-12-22 10:12:48 -08:00
Stephen Birarda	2780415b1d	put glew link back into gpu	2014-12-19 15:07:31 -08:00
Stephen Birarda	d7d11955f3	Revert "add a test to confirm link fail" ... This reverts commit 691be3bf7c.	2014-12-19 15:05:13 -08:00
Stephen Birarda	691be3bf7c	add a test to confirm link fail	2014-12-19 14:59:55 -08:00
Stephen Birarda	9bd0bc671b	resolve conflicts on merge with upstream master	2014-12-19 14:48:18 -08:00
ZappoMan	b7165abd5b	possible glew warning fix for windows	2014-12-19 14:33:45 -08:00
Sam Gateau	a7b039fbb9	Disabling glDebug	2014-12-19 13:28:19 -08:00
Sam Gateau	096b09e8e1	Importing fixes from Model branch to the gpu library	2014-12-19 12:44:46 -08:00
Stephen Birarda	504cd86fef	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 09:13:06 -08:00
Stephen Birarda	114e3bb2ff	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
ZappoMan	8091564a73	remove all glut	2014-12-18 16:12:30 -08:00
Stephen Birarda	b202eb7dae	DRY up gpu library/header linking	2014-12-18 09:14:44 -08:00
ZappoMan	d3bf28e879	more Application dependency cleanup	2014-12-17 11:10:24 -08:00
ZappoMan	28f2dc62ea	add windowshacks.h to GPUConfig.h and move it to shared	2014-12-15 11:49:01 -08:00
Sam Gateau	69792178b9	trying to fix the linux compilation	2014-12-05 13:43:04 -08:00
Sam Gateau	0fbdda7582	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-12-05 10:13:38 -08:00
dev	16da10bf19	compiling the gpu library on mac	2014-12-04 17:15:59 -08:00
dev	da1bb83eb0	compiling the gpu library on mac	2014-12-04 17:14:41 -08:00
Sam Gateau	1102b4d633	Moving GPU into it's own library	2014-12-04 16:40:55 -08:00