4403 commits

Author	SHA1	Message	Date
SamGondelman	27f05db825	fix ao	2019-02-18 01:12:00 -08:00
Andrew Meadows	7872da6b97	Merge pull request #14915 from samcake/brown ... Case 21190: Introducing msaa to forward renderer	2019-02-15 13:48:33 -08:00
Brad Davis	a5f84ab51a	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 11:37:13 -08:00
Sam Gondelman	9aa99f24f0	Merge pull request #14905 from SamGondelman/materialMapping ... Case 20242: FST materialMapping supports our material JSON format	2019-02-15 11:21:51 -08:00
Brad Davis	0b171ffe13	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 10:31:04 -08:00
Sam Gateau	34db48d3a3	Merging and resolving conflict	2019-02-14 17:03:44 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Sam Gateau	522a9ed7c1	Keeping only the minimum for quest	2019-02-14 15:43:36 -08:00
Sam Gateau	98a5ec84a9	Adjusting the HUD operator render job to shave an extra framebuffer	2019-02-14 15:35:02 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
Sam Gateau	bd3a732cdc	Introducing msaa to forward renderer	2019-02-13 17:38:59 -08:00
SamGondelman	13ece79476	merge with master	2019-02-13 16:30:22 -08:00
Brad Davis	db121957d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-12 15:00:03 -08:00
SamGondelman	fdbcf4b2ea	cleanup and expose mapped materials to getScriptableModel	2019-02-12 12:03:35 -08:00
SamGondelman	f75a3e1a72	it's working!	2019-02-12 11:41:47 -08:00
Brad Davis	a6f23f48d6	Merge branch 'feature/quest_custom_plugins' into feature/quest	2019-02-12 09:53:12 -08:00
SamGondelman	61346437da	working on material mapping	2019-02-12 09:22:31 -08:00
Sam Gateau	9ad783135c	Bringing back brownBis to just msaa support	2019-02-11 19:42:05 -08:00
Sam Gateau	8a4f7fe2b6	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-11 18:57:33 -08:00
SamGondelman	77a8ddb3f0	Merge remote-tracking branch 'upstream/master' into materialMapping	2019-02-11 16:35:05 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00
SamGondelman	4f03157f39	working on fst material mapping	2019-02-11 10:20:55 -08:00
Ken Cooke	68480f6760	Replace glm::packSnorm3x10_1x2() with fast SIMD implementation	2019-02-09 10:49:18 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
SamGondelman	f7a487a020	move materialcache et al to material-networking library	2019-02-08 10:28:07 -08:00
SamGondelman	3addcb630c	Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping	2019-02-07 11:45:59 -08:00
Sam Gateau	35491bf5b0	Multisampling works in 4.1	2019-02-06 00:05:17 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
Sam Gateau	4089f8c5b0	Adding Color filter to the tone mapper	2019-02-04 23:45:35 -08:00
Sam Gateau	d0a044120a	Adding the sub samples control	2019-02-03 21:31:19 -08:00
SamGondelman	b80d2a9b06	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-01 13:33:04 -08:00
Sam Gateau	84db9f4729	testing the water...	2019-01-31 16:18:47 -08:00
Brad Davis	10a7403d44	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-01-30 10:19:46 -08:00
Sam Gateau	b47ecc9890	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-01-30 09:17:02 -08:00
Jeff Clinton	3b84580e88	Merge pull request #14794 from SamGondelman/colors ... Case 20888: Fix color space	2019-01-30 09:09:07 -08:00
SamGondelman	56096708d3	one more try	2019-01-29 15:26:49 -08:00
SamGondelman	e41f5617e9	fix color space	2019-01-29 14:52:57 -08:00
Brad Davis	0d34030135	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-01-29 14:13:11 -08:00
SamGondelman	5be6a31b6c	possible fix for transparency	2019-01-29 12:20:46 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
Sam Gateau	3ab66fde5e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-01-28 19:22:33 -08:00
SamGondelman	0d1e4bed66	merge with master	2019-01-28 18:13:05 -08:00
Sam Gondelman	faeb5b36dc	Merge pull request #14764 from SamGondelman/NOverlays12 ... Case 20722: Ring Gizmo Entities to replace Circle Overlays	2019-01-28 18:09:23 -08:00
Sam Gateau	e39a6b5a7d	Merging with master	2019-01-28 17:58:17 -08:00
Brad Davis	f1d3fc36e5	Cleaning up pre-master merge	2019-01-28 15:52:36 -08:00
Brad Davis	b1e4e17f47	Santa Cruz	2019-01-28 15:52:36 -08:00
Shannon Romano	d8f781deae	Merge pull request #14719 from jherico/feature/quest_frame_serialization ... case 20883: GPU frame serialization and related tools	2019-01-28 15:47:55 -08:00
SamGondelman	13cb70a6a5	Merge remote-tracking branch 'upstream/master' into NOverlays12	2019-01-28 11:37:15 -08:00
Sam Gateau	a747bf4cbd	Exploring removing the COmpositing buffer in the display plugin, using srgb for swapchain and debuging from there	2019-01-27 23:48:55 -08:00
Sam Gateau	a2bd802707	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-01-26 12:15:53 -08:00
SamGondelman	becc9f4f8d	DELETE IT ALL	2019-01-25 16:06:59 -08:00
Jeff Clinton	d92d256cfc	Merge pull request #14656 from SamGondelman/matFallthrough ... Case 20241: Material entity fallthrough	2019-01-25 14:01:27 -08:00
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
Sam Gateau	3ec9290dca	Merge pull request #14619 from SamGondelman/matTarget ... Case 20240: Better material entity targeting	2019-01-23 15:47:22 -08:00
Brad Davis	6fb869126e	GPU state cleanup	2019-01-22 10:37:08 -08:00
Sam Gateau	f9891775fc	Enabling msaa framebuffer and testing for forward	2019-01-21 23:07:59 -08:00
SamGondelman	49947d9f6d	better default values	2019-01-21 16:51:08 -08:00
SamGondelman	5b1ea24d20	glsl initializer lists are 4.2	2019-01-21 12:35:48 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -08:00
SamGondelman	717da1b6fa	track texture loading	2019-01-17 15:59:32 -08:00
SamGondelman	8d2e81a13b	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-17 10:27:43 -08:00
SamGondelman	5dd59dd9e9	correct lighting of layered shapes	2019-01-08 14:02:57 -08:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	928ea55d95	fix light crash?	2019-01-08 11:47:28 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
Andrew Meadows	0072684d98	remove cruft and fix error in transform to mesh frame	2019-01-04 12:37:23 -08:00
SamGondelman	a2fe8ef9e7	merge with master	2019-01-03 13:51:07 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	1a62b59a8f	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-02 10:11:46 -08:00
SamGondelman	32bec57cfe	Merge remote-tracking branch 'upstream/master' into NOverlays6	2019-01-02 09:53:29 -08:00
Jeff Clinton	bb27acf934	Merge pull request #14530 from SamGondelman/NOverlays4 ... Case 20134: Grid Entities	2019-01-02 09:12:34 -08:00
Adam Smith	52980559b8	Merge pull request #14491 from SamGondelman/v3 ... Case 20080: v3 + v4 procedurals and misc shader fixes	2018-12-28 15:17:50 -08:00
SamGondelman	87947a7165	try to fix grid color issue	2018-12-25 02:17:37 -05:00
SamGondelman	a25c9395b3	glsl initializer lists are 4.2	2018-12-25 00:46:42 -05:00
SamGondelman	835615fbbd	separate out v3 and v4	2018-12-20 16:33:13 -08:00
SamGondelman	9fc7813e24	Merge remote-tracking branch 'upstream/master' into v3	2018-12-20 16:05:06 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
sam gateau	7e1f75e0f3	Fixing the debug of shadow frustum for real	2018-12-20 13:16:41 -08:00
sam gateau	21577ba311	fixing warnings and the debug of shadows	2018-12-20 09:27:15 -08:00
Sam Gateau	80a55e2ae9	Compiling	2018-12-19 20:01:14 -08:00
sam gateau	253a71a20c	updating some code and probably broken in this version	2018-12-19 18:22:01 -08:00
SamGondelman	bf704c2d0d	remove gl_DepthRange	2018-12-19 16:21:12 -08:00
SamGondelman	3578df7a0e	material targeting	2018-12-19 13:28:33 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	5b50b0332d	more fixes	2018-12-18 15:30:45 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
sam gateau	a4b9ec50e9	one step closer	2018-12-14 17:00:58 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
Sam Gateau	0b03012e5e	introducing the Shadow Stage	2018-12-14 06:55:34 -08:00
Sam Gateau	e07bc208f3	introducing the Shadow Stage	2018-12-14 00:58:07 -08:00
sam gateau	8bfca612e3	Separating the state view dependant from the shadow to be able to have several versions in flight	2018-12-13 17:56:14 -08:00
Sam Gateau	7f193d0e7c	WEll it sn not going to be that simple....	2018-12-13 00:32:59 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Sam Gateau	b09d0b10e9	cleaning light clusters	2018-12-09 22:54:49 -08:00
Sam Gateau	653370e284	Assemble lighting stage works	2018-12-09 11:39:35 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
sam gateau	28d36c81e0	there and back , trying to converge with the new Assemble Lighting Stage task	2018-12-07 16:24:51 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
sam gateau	e941833676	gathering the lighting stage jobs in their own task away from the renderer specificities	2018-12-06 17:27:13 -08:00
Sam Gondelman	50efb48a58	Update GeometryCache.cpp	2018-12-06 12:26:18 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
sam gateau	a267c3115a	drafting more factorisation of render tasks	2018-12-05 17:47:33 -08:00
SamGondelman	9923e76968	cleanup	2018-12-05 17:18:26 -08:00
Sam Gondelman	df6fbefc31	Merge branch 'master' into v3	2018-12-05 16:51:33 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
sam gateau	8efdec1e51	merging with master	2018-12-04 11:03:46 -08:00
sam gateau	0343983f31	Applying changes done in deferred to forward	2018-12-03 16:58:54 -08:00
Sam Gateau	259a97c43a	Exploring varying with names	2018-12-02 23:41:57 -08:00
sam gateau	2c4cd68a00	iterating on a simpler engine graph	2018-11-30 17:43:27 -08:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Sam Gateau	ba4aec2aff	Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf	2018-11-28 01:01:18 -08:00
Sam Gondelman	5ee803bf1d	Update parabola.slv	2018-11-27 10:54:56 -08:00
Sam Gondelman	3a4ec2cc27	Update glowLine.slv	2018-11-27 10:53:25 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -08:00
Sam Gateau	b7b8e8e6bf	Trying to group together the debug jobs in a separate task	2018-11-26 00:38:04 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00
Sam Gateau	dd828c81e0	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-20 19:29:01 -08:00
Jeff Clinton	870619b19d	Merge pull request #14412 from amantley/avatarPipelineOffsets ... Avatar Pipeline Joint Rotation Offsets Handling	2018-11-19 08:54:29 -08:00
Sam Gateau	837b321004	merging with master	2018-11-17 10:35:05 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
amantley	f9829c270d	merged new fbx.h	2018-11-15 10:19:04 -08:00
amantley	c8cd65c3bd	added getter for the orginal cluster bind matrix values in AnimSkeleton	2018-11-15 09:58:10 -08:00
Sam Gondelman	a5fe4709a9	Update Fade.slh	2018-11-14 17:50:21 -08:00
amantley	80ebde1036	started cleanup of pr	2018-11-14 17:27:45 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
amantley	8256c652fc	added the hook to put the copy of the mutated bind poses into tthe skeleton	2018-11-14 17:02:25 -08:00
Olivier Prat	85a3938cbe	Switch to app for ambient occlusion debug script	2018-11-14 11:55:11 +01:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
John Conklin II	512b847684	Merge pull request #14339 from hyperlogic/bug-fix/anim-debug-draw-crash ... AnimDebugDraw: Prevent multi-threaded access to shared map collection.	2018-11-12 10:47:01 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
Brad Hefta-Gaub	22dd958582	Merge pull request #14297 from jherico/feature/vcpkg ... Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms	2018-11-12 09:52:02 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
SamGondelman	b3abd97707	projected materials and repeat property	2018-11-09 10:47:07 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Olivier Prat	be7806644a	Removed ternary operators with mix (try to limit branching)	2018-11-08 17:29:00 +01:00
Olivier Prat	d64127aa9c	Android shader compilation fix	2018-11-08 13:48:19 +01:00
Olivier Prat	829e5ff44f	Same android problem fix, but elsewhere	2018-11-08 13:37:22 +01:00
Olivier Prat	09b26db650	Shader fix for android... <sigh>	2018-11-08 13:19:42 +01:00
Olivier Prat	40b7b42f5b	Bis	2018-11-08 12:29:01 +01:00
Olivier Prat	cd89ce5388	Another stupid android shader compilation error fix	2018-11-08 12:07:17 +01:00
Olivier Prat	de2f1c52cc	Another android shader compilation fix	2018-11-08 11:44:47 +01:00
Olivier Prat	05ac2fccb6	Still android fixes	2018-11-08 11:24:46 +01:00
Olivier Prat	851cfff960	Again, android shader compilatio fix	2018-11-08 11:06:28 +01:00
Olivier Prat	c79c403a52	More android shader compilation fixes	2018-11-08 10:47:24 +01:00
Olivier Prat	7e93d91bfa	Fixed android shader compilation	2018-11-08 09:29:02 +01:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Sam Gateau	d15c8a8854	Merge pull request #14313 from SamGondelman/macFix ... Case 19686: Possibly fix mac debug deferred issue	2018-11-07 10:33:41 -08:00
sabrina-shanman	2801f324b7	Switch references to HFM to the HFM lib and remove HFM classes in FBX	2018-11-05 12:47:34 -08:00
Anthony Thibault	dc43d1bf8f	AnimDebugDraw: Prevent multi-threaded access to shared map collection. ... It was possible for the render thread to iterate over a map while the main thread mutates the same map. This could have led to memory corruption and crashes. To fix this we make a copy of the collection and pass the copy to the lambda that executes on the render thread.	2018-11-02 17:53:07 -07:00
Sam Gateau	fa0c58fa0e	Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend	2018-11-02 00:08:47 -07:00
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
Sam Gondelman	e534e09801	Update LightClusterGrid_shared.slh	2018-11-01 15:35:48 -07:00
SamGondelman	c4c4d2c98d	possibly fix mac issues	2018-10-31 13:28:07 -07:00
sabrina-shanman	becee7f010	Re-name FBXGeometry to HFMGeometry and do the same for related classes	2018-10-30 17:28:42 -07:00
Cristian Luis Duarte	bc7e49482a	Add Android for the condition of _meshBlendshapeBuffer usage	2018-10-30 19:44:39 -03:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
SamGondelman	7dff015585	maybe?	2018-10-25 14:40:58 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
Olivier Prat	aa64e51281	Fixed shaders for GLSL 4.1	2018-10-24 11:04:32 +02:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
SamGondelman	09ea32dcc0	fix fading and highlighting issues	2018-10-22 14:12:43 -07:00
SamGondelman	5652fa0b1e	merge with master	2018-10-22 10:18:52 -07:00
Olivier Prat	5f3a299fd9	Merge with master	2018-10-22 14:02:24 +02:00
Seth Alves	2ce8ed25f8	Merge pull request #14125 from Atlante45/fix/mac-warnings ... Fix new Mac warnings	2018-10-20 13:40:53 -07:00
Sam Gateau	388b31acf7	Merge pull request #14169 from SamGondelman/highlight ... Fix highlight not working after HMD switch	2018-10-19 11:58:25 -07:00
John Conklin II	9c841db9fb	Merge pull request #14184 from SamGondelman/blendshape ... Move blendshape buffers to render thread	2018-10-19 11:55:44 -07:00
SamGondelman	47c6825aea	CR	2018-10-18 11:08:53 -07:00
SamGondelman	de4dff5202	fix highlight weirdness	2018-10-17 16:18:55 -07:00
SamGondelman	cce0981d6c	Merge remote-tracking branch 'upstream/master' into police	2018-10-17 11:40:01 -07:00
John Conklin II	72c9f697ab	Merge pull request #14119 from SamGondelman/varying ... Move stage frames to Varyings	2018-10-17 11:16:28 -07:00
John Conklin II	9f0b4fb437	Merge pull request #14122 from SamGondelman/skybox ... Rebake default skybox for all platforms	2018-10-17 09:50:00 -07:00
Sam Gondelman	121fc7205c	Delete Default-Sky-9-cubemap.texmeta	2018-10-14 22:36:22 -07:00
Sam Gondelman	39c828fad8	please	2018-10-10 19:07:49 -07:00
Sam Gondelman	2421f9388c	FIX BUILD ERRORS?	2018-10-10 17:09:35 -07:00
Sam Gondelman	6ed38ea333	fix build errors	2018-10-10 16:16:56 -07:00
Sam Gondelman	296bd65c9b	fix build errors	2018-10-10 16:05:14 -07:00
SamGondelman	327c2f4e3d	move blendshape buffers to render thread	2018-10-10 15:32:53 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Olivier Prat	cfcf6f05a2	Merge with master	2018-10-09 14:18:02 +02:00
SamGondelman	c10bb7d525	pointers	2018-10-08 18:05:09 -07:00
Sam	87efeb1a70	make sure that we compile, dah	2018-10-03 16:15:07 -07:00
sam gateau	81e0d5ced0	Merge branch 'black-bis' of github.com:samcake/hifi into black-bis	2018-10-03 16:03:33 -07:00
sam gateau	702d26d2bd	Addressing the bug on Mac AMD	2018-10-03 16:03:09 -07:00
Sam Gateau	c194e795ac	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-03 12:12:15 -07:00
Olivier Prat	1322302b6b	Default parameter tweaking	2018-10-03 14:17:24 +02:00
Olivier Prat	fe15063459	Another compilation fix	2018-10-03 09:34:31 +02:00
Olivier Prat	7124474b0e	Fix ubuntu compilation	2018-10-03 09:33:40 +02:00
Olivier Prat	b131de9e51	Added some comments	2018-10-03 08:43:51 +02:00
Olivier Prat	8ad58754da	Fixed compilation on Mac, Ubuntu and Android	2018-10-03 08:41:03 +02:00
sam gateau	5d0f2e3035	And more changes for better syntax and less useless stuff	2018-10-02 13:09:04 -07:00
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Olivier Prat	72d0693252	Clean up for stereo	2018-10-02 18:46:01 +02:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Olivier Prat	dfe9deb154	Two group of config settings for SSAO and HBAO	2018-10-02 17:47:33 +02:00
Olivier Prat	6fcd63ed64	Improved acnee issues	2018-10-02 15:08:39 +02:00
Olivier Prat	1ed0bd68b9	Small bilateral blur optim	2018-10-02 12:25:00 +02:00
Olivier Prat	6420d96149	Tried to limit banding effect	2018-10-02 11:16:23 +02:00
Olivier Prat	454531e3c3	Switched back to cos HBAO	2018-10-02 10:26:55 +02:00
Sam Gateau	c95c736b1f	FOUnd a working path for gl41	2018-10-01 22:50:29 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	2f3a9412f3	Make highlight occlusion match overlay occlusion	2018-10-02 15:36:18 +13:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
sam gateau	392e2ff535	trying and failing andad trying and rince and repeat	2018-10-01 17:45:16 -07:00
John Conklin II	0ef407a45c	Merge pull request #14116 from sethalves/fix-bad-render-downcasts ... get asan to not complain about invalid downcasts during transaction.updateItem	2018-10-01 16:57:03 -07:00
SamGondelman	49553e0285	bake default skybox	2018-10-01 14:05:15 -07:00
sam gateau	c12115bfda	Addressing the 4.1 pass and make sure it works on windows pc and mac	2018-10-01 11:51:46 -07:00
SamGondelman	de90ce5f2b	move stage frames to varyings	2018-10-01 11:26:02 -07:00
Olivier Prat	7f6c9a6cc1	Switched to sin based HBAO	2018-10-01 19:22:54 +02:00
Sam Gateau	5842416ae6	Exploring the possible packing schemes and trying to debug the tangent	2018-09-30 23:11:36 -07:00
Seth Alves	90d9af35b5	minimize diff	2018-09-30 16:05:08 -07:00
Seth Alves	e30497595c	static_cast can be used here rather than dynamic	2018-09-30 15:49:42 -07:00
Seth Alves	749b02cfb8	get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor	2018-09-30 15:12:49 -07:00
sam gateau	1ff4c54c1c	Packing normal and tangents	2018-09-28 17:49:52 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
Olivier Prat	abc415c5ad	Put back temporal jitter of SSAO (but without filtering)	2018-09-28 19:33:34 +02:00
Olivier Prat	9f9fe909b0	Fixed bugs in stereo	2018-09-28 19:22:20 +02:00
Olivier Prat	086ba998c8	Some small cleanups	2018-09-28 16:41:18 +02:00
Olivier Prat	fbd158938b	Put some bilateral blur computation on CPU	2018-09-28 11:31:09 +02:00
Sam Gateau	faf489855c	Packing the offsets and catching up performances	2018-09-28 02:13:08 -07:00
Olivier Prat	6240454c55	Switched back to half res depth when resolutionLevel>1	2018-09-28 10:33:47 +02:00
Olivier Prat	8e914fa565	Bilateral blur shader cleanup and quad split normal at occlusion resolution	2018-09-28 10:25:57 +02:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00
SamGondelman	e069817978	more fixes	2018-09-27 14:18:43 -07:00
Olivier Prat	135e10eaa2	Packed occlusion depth for faster bilateral filtering	2018-09-27 19:51:01 +02:00