447 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	dccf121cd3	Merge pull request #5928 from jherico/homer ... Disabling vertex attrib format due to crashes	2015-09-29 10:01:36 -07:00
Brad Davis	daf803e8ea	Disabling vertex attrib format due to crashes	2015-09-29 09:52:41 -07:00
samcake	8a8411c8d1	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-09-29 09:15:53 -07:00
samcake	833c31a6a6	Merge pull request #5923 from jherico/lisa ... Fix broken textures in stereo/HMD	2015-09-28 18:21:08 -07:00
Brad Hefta-Gaub	670df7e443	fix coding standard issue and comment	2015-09-28 17:36:42 -07:00
Brad Davis	375d783997	Better fix for texture issues in stereo	2015-09-28 17:13:51 -07:00
Brad Davis	88d48994ed	Disabling glVertexAttribFormat for now because of an issue with instancing	2015-09-28 16:17:56 -07:00
Brad Hefta-Gaub	32b56a4bf7	fix the slight flicker that's being caused by error in calculating the model inverse matrix	2015-09-28 16:09:57 -07:00
samcake	728a4cb112	Adding the comment to the glActiveBindTexture call	2015-09-28 12:45:39 -07:00
samcake	95ea874d43	Minor fixes to the way the specular color is interpreted	2015-09-28 12:43:15 -07:00
Brad Davis	203c601e95	Fix for bad textures when using _glActiveBindTexture	2015-09-28 12:26:11 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
samcake	46e9c463fc	Merge pull request #5885 from ZappoMan/batchOptimizations ... Batch optimizations	2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub	432dc2055f	gak	2015-09-23 17:38:59 -07:00
Brad Hefta-Gaub	9a0e5b9870	address Sam's concerns	2015-09-23 17:37:48 -07:00
Brad Hefta-Gaub	62c1e40127	CR repairs	2015-09-23 17:15:29 -07:00
ZappoMan	65a079cb53	fix mac build	2015-09-23 16:48:34 -07:00
samcake	9c44c3e4a4	Removing warnings	2015-09-23 16:19:34 -07:00
samcake	5176d51714	Merge and fix warnings	2015-09-23 16:05:53 -07:00
Brad Hefta-Gaub	24e2215f14	fix mac/unix build	2015-09-23 15:47:52 -07:00
samcake	5fd2992c28	sometimes, magic happens, and clean rebuilds...	2015-09-23 15:34:49 -07:00
samcake	83116fdd85	Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced	2015-09-23 15:20:39 -07:00
Brad Hefta-Gaub	ef25876c9a	implement vector caching for gpu::Batch	2015-09-23 14:46:47 -07:00
samcake	acfb5a32bc	Rename the nb parameters with num	2015-09-23 12:28:46 -07:00
samcake	8735aa8003	Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux	2015-09-23 12:19:17 -07:00
Brad Hefta-Gaub	7536fed09a	more warning fixes	2015-09-22 17:22:09 -07:00
Brad Davis	deaa4a747b	Batch side implementation of multi-draw indirect	2015-09-22 15:56:58 -07:00
samcake	4513b64b00	fixing review comments	2015-09-21 22:42:24 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
Bradley Austin Davis	e024d23366	Instancing work, second pass	2015-09-21 13:27:02 -07:00
samcake	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00
samcake	c9cb768945	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-09-19 09:00:19 -07:00
samcake	8941741508	Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap	2015-09-18 18:47:18 -07:00
Brad Hefta-Gaub	ec87502f49	Merge pull request #5840 from jherico/bart ... Instanced rendering for Box entities	2015-09-18 18:06:25 -07:00
Brad Davis	8a703d0363	Instanced rendering, first pass	2015-09-18 16:29:29 -07:00
Bradley Austin Davis	f851c6204f	Remove overcalling of glVertexAttrib4f	2015-09-18 15:14:04 -07:00
Sam Gateau	b207d97f72	Fix the lighting when the rear view mirror is showing up	2015-09-17 12:28:17 -07:00
Sam Gateau	400f90aea4	Introducing a stereo loop that should do the right thing but doesn't yet	2015-09-15 08:34:46 -07:00
Brad Davis	1bb15e28d6	Fixing differing highlights between left and right eyes in stereo modes	2015-09-14 11:24:28 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
Brad Davis	743d79335d	Procedural shaders V2	2015-09-07 17:37:45 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Andrew Meadows	45c846572e	Merge pull request #5645 from jherico/maggie ... Fixing problems reported by static analysis tool	2015-08-26 08:31:05 -07:00
samcake	fda9827100	Merge pull request #5529 from SeijiEmery/gputest ... gputest	2015-08-25 20:03:08 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Seiji Emery	4d9f45475e	Merge branch 'master' of https://github.com/highfidelity/hifi into gputest	2015-08-24 14:38:26 -07:00
Brad Davis	76f236adf6	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00