586 commits

Author	SHA1	Message	Date
Sam Gateau	b065b99b0b	fix linux compilation maybe	2017-07-13 09:30:04 +02:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Sam Gateau	c3dd25e499	Drafting the mechanism to add shape pipeline	2017-07-07 18:26:10 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Sam Cake	07e18eb3a8	Keep cleaning up the DeferredLightingEffect , removing stage s from there...	2017-06-22 01:12:32 -07:00
samcake	9ae2861ee6	Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements	2017-06-21 18:29:38 -07:00
samcake	56d5f4ec5c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-21 11:25:07 -07:00
Sam Cake	09529f6592	One more refinemnt of the comment	2017-06-21 00:54:04 -07:00
Sam Cake	484aeed589	More comments on the getCOnfig call	2017-06-21 00:36:03 -07:00
Sam Cake	c35be446e6	adding profiling on the script engine call back to timer event	2017-06-21 00:06:45 -07:00
samcake	d853a76376	Fixing the scripts and investigating the scripting	2017-06-20 17:23:44 -07:00
Sam Cake	5b6f6ab84f	Trying to fix the getCOnfig from QML...	2017-06-20 00:25:51 -07:00
samcake	653ce89e08	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-19 15:48:46 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Sam Cake	df340a5b55	COmpiling	2017-06-14 22:39:47 -07:00
samcake	d8380923f0	Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages	2017-06-14 18:06:42 -07:00
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -07:00
Sam Cake	1f090d8148	Debugging the size problem and fixing the compression size evaluation	2017-05-22 01:00:34 -07:00
samcake	c449229850	Cleaned up the counters for memory	2017-05-19 17:52:56 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
samcake	b466964817	REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior	2017-05-16 18:21:24 -07:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
samcake	c36f8da4c0	Fixing build on mac	2017-04-24 10:46:29 -07:00
Sam Cake	33d770c24e	removing the explicit SettingHandle path to REnder?engine	2017-04-24 00:52:09 -07:00
Sam Cake	fa62a1ba9d	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-22 08:53:44 -07:00
Sam Cake	3691be4a2f	PUshing function to cpp	2017-04-22 08:53:13 -07:00
samcake	8e73fa3eb4	Separating the task classes in their own folder, and easing the declaration	2017-04-21 18:16:07 -07:00
sam gateau	733e268391	FIx the SSBO usage on amd, needed a bit more explanation on the glsl side	2017-04-21 16:17:18 -07:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
Sam Cake	321d281919	Separating job/task classes from the render specific	2017-04-21 01:46:44 -07:00
samcake	63fe579022	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -07:00
Sam Cake	61ed5c3ce9	THank you mac	2017-04-15 01:35:28 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	96960a505d	COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side	2017-04-14 23:22:45 -07:00
Sam Cake	bb15b8c701	ANd fixing the gl41 rendering	2017-04-14 00:46:41 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00