310 commits

Author	SHA1	Message	Date
Sam Gateau	66cd17ec66	REmove the crappy solution for drawing transparent texture into overlay by a proper shader	2015-07-23 23:09:40 -07:00
Sam Gateau	ded95a3dde	removing dead code	2015-07-23 16:58:21 -07:00
Sam Gateau	a424ff98ca	Fixing issues with the review process	2015-07-23 16:55:18 -07:00
Sam Gateau	d56b5f39fb	strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels	2015-07-23 16:31:11 -07:00
Sam Gateau	be9d99264f	Introducing the download Framebuffer call on the context to capture a snapshot	2015-07-23 16:15:10 -07:00
Sam Gateau	dc10f30d3d	Merged	2015-07-23 15:10:42 -07:00
Sam Gateau	a561874ce3	Render the rear view mirror in a separate target and then display it during overlay pass	2015-07-23 14:56:14 -07:00
ZappoMan	bd6534a991	remove deprecated renderBatch()	2015-07-23 08:35:03 -07:00
Sam Gateau	f70553ec95	Fixing merge	2015-07-22 11:31:46 -07:00
Sam Gateau	8dbd991652	USing a modern singleton guard	2015-07-22 10:54:40 -07:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Sam Gateau	7b35048e52	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-21 11:18:15 -07:00
Sam Gateau	93afdf79a3	Removing the gl driver version report intiialization code out of applciation	2015-07-21 11:17:41 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	c3a2b72c13	Breaking framebuffer ops out of texture cache	2015-07-20 17:26:26 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00
Brad Davis	d4e637c5b8	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Bradley Austin Davis	5e0a0409bf	Removing setupWorldLight from viewstateinterface	2015-07-18 12:16:51 -07:00
Brad Davis	b7fdfd8663	Working on lighting	2015-07-18 10:55:53 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Brad Davis	c822e66317	Merge pull request #5346 from samcake/daft ... Adding the scissor rect in the Batch and a way to enable the scissor during clear command	2015-07-17 17:04:42 -07:00
Sam Gateau	9eff19b0f7	add th emissing function	2015-07-17 15:47:17 -07:00
ZappoMan	ccd2f98a76	one more try	2015-07-17 15:28:25 -07:00
Sam Gateau	50a521e1f2	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-16 12:38:47 -07:00
Sam Gateau	4ca333efe1	Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands	2015-07-16 12:38:11 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
Sam Gateau	440464f884	Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile	2015-07-14 18:35:11 -07:00
samcake	99ae0326ad	FIxing th ecompilation issue on mac, ready to ship	2015-07-13 19:17:09 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler ... quiet compiler	2015-07-13 15:55:35 -07:00
Seth Alves	5aca0c28ef	quiet compiler	2015-07-13 07:37:59 -07:00
Seth Alves	fb23eb0faf	Merge pull request #5301 from samcake/yellow ... Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture	2015-07-12 11:36:03 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Sam Gateau	6c04e6d382	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-10 11:59:31 -07:00
samcake	014802fd45	Merge pull request #5277 from venkatn93/gpuquery ... GPU Query infrastructure	2015-07-10 11:59:08 -07:00
Niraj Venkat	2e5fd04d9e	Fix to get build working on Linux	2015-07-10 11:27:34 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Brad Davis	6c5d7b8789	Performance optimizations in transform buffers and geometry cache	2015-07-09 17:53:26 -07:00
Sam Gateau	6b229d8d2d	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-09 03:45:55 -07:00
Sam Gateau	8314fe8c7f	FInally getting a nice spot light volume working for all angles	2015-07-09 03:45:19 -07:00
Niraj Venkat	58f127f299	Fixing names of GL enums	2015-07-08 17:17:31 -07:00
Niraj Venkat	1894b42773	Added EXT support for Mac GL Query calls	2015-07-08 16:11:36 -07:00