34 commits

Author	SHA1	Message	Date
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Alexander Ivash	d0ac5128b0	repurpose qmlscratch into 'controls gallery' launcher	2018-11-06 14:21:14 +05:30
sabrina-shanman	a98a9b1c0c	Move HFM prefixed classes to hfm namespace and add HFM prefixed names as typedefs	2018-11-05 12:47:34 -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
sabrina-shanman	cbca77b12f	Rename HFMGeometry to HFMModel and adjust related variables	2018-11-01 17:17:48 -07:00
sabrina-shanman	643026abd6	Change local variable in TestFbx for clarity	2018-10-31 14:15:39 -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
Brad Davis	9a30073f27	Only enable debug GL context on demand	2018-10-26 11:23:29 -07:00
Brad Davis	405ec228b8	Fix mac warning	2018-10-26 11:23:29 -07:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00
Bradley Austin Davis	5416de9a02	Merge pull request #13951 from jherico/feature/spirv ... Bug 15087: Updating our shader tool chain to enable SPIRV optimization	2018-10-23 13:27:49 -07:00
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Alexander Ivash	d4286636c8	repurpose qmlscratch into 'controls gallery' launcher	2018-10-18 21:05:20 +03:00
Seth Alves	bbe9b5c26f	code review, remove some unneeded automoc includes	2018-09-28 16:04:40 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
Sam Gateau	294fe51fde	Trying to simplify the LOD culling test	2018-08-24 16:48:23 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
Bradley Austin Davis	fc51b93691	Fix OSX build	2018-08-03 16:15:58 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Andrew Meadows	4424a8df11	Merge pull request #13303 from highfidelity/workload ... workload project part 1	2018-06-20 15:39:01 -07:00
SamGondelman	aec7206901	get rid of overlay pipelines and just use forward rendering	2018-06-05 14:44:44 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
John Conklin II	6095a3b319	Merge pull request #13082 from jherico/feature/shader_cache ... Shader load time performance optimiziations	2018-05-30 13:55:34 -07:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
Seth Alves	79b5882c73	quiet compiler when building with clang on Linux	2018-05-15 11:00:08 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
Brad Davis	12ae44c14f	Remove debugging pragma	2018-05-09 13:20:47 -07:00
Brad Davis	f206456cdd	Restoring manual tests to solution, removing dead tests	2018-05-09 13:20:47 -07:00
Brad Davis	d5afb3a49b	Move non-automated tests into new folder	2018-05-09 13:20:47 -07:00