144 commits

Author	SHA1	Message	Date
Seth Alves	b69cba1aba	respond to code-review	2015-04-25 10:50:18 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Sam Gateau	8b97d2585a	fixing syntax issues	2015-04-15 10:16:04 -07:00
Sam Gateau	598abe6722	Cleaning up Frambuffer.h	2015-04-14 18:48:06 -07:00
Sam Gateau	fec52f6b10	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
Sam Gateau	87030236cb	working version with the gpu::SAmpler and the gpu::Framebuffer	2015-04-14 15:53:24 -07:00
Sam Gateau	c34c5f6075	adding the Fremabuffer to be used for shadows and main rendering	2015-04-14 08:47:52 -07:00
Sam Gateau	51ce3129b9	connecting the dots for a framebuffer GLBackend, need to be tested	2015-04-13 12:22:08 -07:00
Sam Gateau	05689c0413	Bringin the Framebuffer to GLBackend and refining the interface	2015-04-13 11:13:30 -07:00
Sam Gateau	69484ad00b	Creating the Framebuffer class and the companion Swapbuffer	2015-04-12 17:36:45 -07:00
Andrew Meadows	e9159304d2	Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol ... Acceleration and owner in wire protocol	2015-04-10 09:07:47 -07:00
David Rowe	ae3d606e95	Replace try with nothrow	2015-04-09 10:01:31 -07:00
David Rowe	b2dd53ac43	Coding standard	2015-04-09 08:37:24 -07:00
David Rowe	e768852645	Fix catching bad_alloc ... Non-allocation wasn't caught on Windows; it just crashed.	2015-04-08 20:02:22 -07:00
Seth Alves	2448051c75	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-08 15:39:40 -07:00
Seth Alves	5c709e2638	quiet compiler	2015-04-08 15:39:07 -07:00
samcake	4fb5c8f907	fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from.	2015-04-08 11:04:13 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Sam Gateau	7f46736bb4	playing with the shadwos	2015-04-06 17:17:25 -07:00
Seth Alves	8bd77fbcc7	separate out logging for fbx and gpu libraries	2015-04-06 16:52:31 -07:00
Sam Gateau	07e7f6ea1d	FIx review comments	2015-04-06 15:40:29 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Sam Gateau	6f5c411a46	Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly	2015-04-03 10:32:20 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00
Sam Gateau	d4dac0477b	changed again the state field storage for hopefully the better by using the Cache class and compressing it	2015-03-31 09:47:56 -07:00
samcake	1a18719031	and make it compile on mac... remove the field map from state just because it's unecessary	2015-03-30 21:53:59 -07:00
Sam Gateau	ee4b9a483b	found the issue brekaing the render, i didn't do the Blend enable sync properly	2015-03-30 18:04:44 -07:00
Sam Gateau	ee3ec3fe1a	found the issue brekaing the render, i didn't do the Blend enable sync properly	2015-03-30 17:28:58 -07:00
Sam Gateau	2a58a65a8f	back to the office monday morning, State almost working in the full piupeline	2015-03-30 10:10:39 -07:00
Sam Gateau	ce659e6307	Introducing the gl state capture in order to resync the gpu::state with the true gl state	2015-03-29 10:15:18 -07:00
Sam Gateau	21b5d6f404	refining the state interface and the GLBackend for it with a true cache	2015-03-28 11:26:06 -07:00
Sam Gateau	9c44100bb8	cleaning the State class code	2015-03-27 10:33:29 -07:00
Sam Gateau	c9e0360394	using gpu::Pipeline it s mostly working but still glUniforms to get rid of	2015-03-26 13:48:49 -07:00
Sam Gateau	1746c1de46	t :wq ... Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-25 16:27:32 -07:00
Sam Gateau	045dbb11a3	Putting the GLERRORCHECK only in debug	2015-03-25 11:07:19 -07:00
Sam Gateau	c9377d0811	the model renderer now uses the map of renderPIpeline and the pipeline object of gpu, yeah. fixed the state to do the basics glState stuff correctly	2015-03-25 10:16:18 -07:00
Sam Gateau	6284159892	Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline	2015-03-24 14:58:41 -07:00
Sam Gateau	19a96c4815	Adding the State to gpu and wiring the pipeline in glBackend to potentially make it work soon :)	2015-03-23 22:33:25 -07:00
Sam Gateau	69667fb5ca	making the state work	2015-03-23 10:21:35 -07:00
Sam Gateau	07bcd115c2	trying to remove useless glsl code for Legacy path	2015-03-20 13:28:42 -07:00
Sam Gateau	5063159581	cleaning code for review	2015-03-20 12:00:16 -07:00
Sam Gateau	fdbf4e5288	cleaning code for review	2015-03-20 11:55:00 -07:00
samcake	d2868bcafc	fixing the shader for mac	2015-03-19 16:00:47 -07:00
Sam Gateau	619a323196	Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack	2015-03-19 14:46:50 -07:00
Sam Gateau	b33ba64e05	trying to tweek the transform equation to find the intel bug	2015-03-18 17:20:27 -07:00
samcake	0f22d64802	compilation on MacOSX	2015-03-18 16:28:42 -07:00
Sam Gateau	414315b6e0	Since glProgramUniform is not supported on MAc we need a workaround...	2015-03-18 16:15:06 -07:00
Sam Gateau	b5eb4a7f5b	Since glProgramUniform is not supported on MAc we need a workaround...	2015-03-18 16:12:47 -07:00