SamGondelman
|
44ea5a2e84
|
add etc2/eac support
|
2018-04-05 18:59:22 -07:00 |
|
Olivier Prat
|
da6bd92ff6
|
Merged with master
|
2018-03-09 10:07:25 +01:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
Brad Davis
|
136ced98c3
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-27 13:44:00 -08:00 |
|
SamGondelman
|
6fe2d46d7c
|
merge
|
2018-02-26 12:40:14 -08:00 |
|
humbletim
|
f824edd04e
|
* remove Model_temporary_hack
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
|
2018-02-26 04:58:22 -05:00 |
|
SamGondelman
|
b56f755034
|
material reflection
|
2018-02-23 17:58:46 -08:00 |
|
Brad Davis
|
0550138609
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-23 12:48:10 -08:00 |
|
Olivier Prat
|
37fdf81f1b
|
Fix warnings on mac and ubuntu
|
2018-02-23 19:37:12 +01:00 |
|
Olivier Prat
|
4636f43728
|
Simplified camera view history and TAA is now working in all circumstances.
|
2018-02-23 10:19:05 +01:00 |
|
Brad Davis
|
aeb29db37d
|
Merge remote-tracking branch 'upstream/stable' into android_stable
|
2018-02-22 17:35:00 -08:00 |
|
Olivier Prat
|
ae63610582
|
Added history of view to try to adjust for GPU slower than game
|
2018-02-22 23:03:33 +01:00 |
|
Olivier Prat
|
093a1491cd
|
Renamed resourcering to resourceswapchain
|
2018-02-21 15:43:19 +01:00 |
|
Olivier Prat
|
4edfe6c9ab
|
Trying to keep track of a better previous correction
|
2018-02-20 14:48:21 +01:00 |
|
Olivier Prat
|
247a1f5769
|
Working ring frame buffer with antialiasing but still issues with TAA on HMD
|
2018-02-20 09:22:19 +01:00 |
|
Olivier Prat
|
18af60f3eb
|
Added RingBuffer mechanism to gpu lib
|
2018-02-19 18:48:58 +01:00 |
|
Olivier Prat
|
9cfe53be3e
|
Merged from orgin taa
|
2018-02-19 17:50:10 +01:00 |
|
Olivier Prat
|
f5a2557a2e
|
Merged with master
|
2018-02-19 17:28:39 +01:00 |
|
John Conklin II
|
51bf3c1466
|
Merge pull request #12323 from Zvork/shadow
Shadow performance / acnee improvements
|
2018-02-12 14:41:13 -08:00 |
|
Bradley Austin Davis
|
fd007e845d
|
Squashed scribe changes
|
2018-02-07 10:29:29 -08:00 |
|
Bradley Austin Davis
|
0455fb37b6
|
Merge remote-tracking branch 'upstream/master' into fix/shader_length
|
2018-02-06 15:55:01 -08:00 |
|
vladest
|
0715a7cae5
|
Add include with std::function
|
2018-02-05 21:02:44 +01:00 |
|
Olivier Prat
|
92279b5939
|
Merged with master
|
2018-02-05 18:24:05 +01:00 |
|
Olivier Prat
|
2940a67b3e
|
Merged with master
|
2018-02-03 16:55:25 +01:00 |
|
Olivier Prat
|
3804917cf4
|
Orthographic octree selection seems to be working
|
2018-02-02 09:40:57 +01:00 |
|
samcake
|
9867b479fd
|
APplying review feedback
|
2018-02-01 13:12:28 -08:00 |
|
samcake
|
fd501cf3af
|
Addressing review comments
|
2018-02-01 10:37:54 -08:00 |
|
Sam Gateau
|
edb416d24e
|
Fixing the program map sorting, good to go
|
2018-01-31 21:32:22 -08:00 |
|
samcake
|
89f4fe1c04
|
Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them
|
2018-01-31 17:28:45 -08:00 |
|
samcake
|
f044cf76d6
|
add the count of compilations of shaders to avoid recompiling them if ot needed
|
2018-01-30 18:31:30 -08:00 |
|
samcake
|
f078ff611a
|
Refining the declaraion signatures and adding the binary capture
|
2018-01-30 15:10:52 -08:00 |
|
samcake
|
d5e52834ef
|
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
|
2018-01-30 13:07:20 -08:00 |
|
samcake
|
2dcedf9f39
|
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
|
2018-01-30 12:52:05 -08:00 |
|
Olivier Prat
|
5af4337b0e
|
Merged with master
|
2018-01-25 10:11:53 +01:00 |
|
Olivier Prat
|
f3aac2a7b5
|
Merged with samcake/black
|
2018-01-25 09:27:48 +01:00 |
|
Olivier Prat
|
95882e0cde
|
Merged with master
|
2018-01-24 10:51:54 +01:00 |
|
Brad Davis
|
d26084f0ca
|
Allow us to catch invalid slots at batch setup time
|
2018-01-18 16:47:43 -08:00 |
|
Olivier Prat
|
3911ce59cc
|
Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code
|
2018-01-16 19:02:12 +01:00 |
|
Brad Davis
|
acb95d1355
|
GLAD polish
|
2018-01-14 00:10:05 -08:00 |
|
Sam Gateau
|
331a8f3094
|
fixing the stencil not clearing correctly and shaders not compiled correctly in main thread
|
2018-01-13 01:00:10 -08:00 |
|
Brad Davis
|
ab7aa52a10
|
GLES emulaton on windows
|
2018-01-12 19:17:35 -08:00 |
|
Olivier Prat
|
814de4ab81
|
Scribe now outputs shaders as cpp files.
|
2018-01-12 11:59:19 +01:00 |
|
Gabriel Calero
|
9fa06e0019
|
Fixes to load cubemap
|
2018-01-11 11:12:58 -03:00 |
|
Brad Davis
|
2c35242af1
|
Merge remote-tracking branch 'upstream/master' into android_nov
|
2018-01-10 13:40:12 -08:00 |
|
Brad Davis
|
a2c2e7d9ff
|
Fixes to load cubemap
|
2018-01-08 14:43:54 -08:00 |
|
Gabriel Calero
|
6050737e7c
|
Resolving comments in PR
|
2018-01-08 17:36:08 -03:00 |
|
Olivier Prat
|
1d5f65b082
|
Updated Mesh to support map and forEach operations on colors in RGBA8 format and normals in XYZ10W2 format
|
2017-12-22 15:16:39 +01:00 |
|
Olivier Prat
|
0d34569b1a
|
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
|
2017-12-21 08:22:35 +01:00 |
|
samcake
|
d02c2ac8f5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-12-19 13:39:27 -08:00 |
|
Olivier Prat
|
f4f0bb9c1c
|
Fixed assert in Buffer update when switching to HMD simulator
|
2017-12-18 16:26:05 +01:00 |
|