Commit graph

3833 commits

Author SHA1 Message Date
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf
Move blendshape packing to worker thread
2018-08-27 09:40:03 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom
Enable bloom in zone properties
2018-08-24 14:46:31 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
John Conklin II
04d72ea39d
Merge pull request #13850 from samcake/punk
Adjust Workload Region to be bigger
2018-08-22 10:21:14 -07:00
Sam Gateau
0f6f465e7f Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-21 19:23:33 -07:00
Brad Davis
e9683011f8 Fix parabola rendering on AMD GPUs 2018-08-21 16:58:38 -07:00
Bradley Austin Davis
d3fd2132ce
Merge pull request #13851 from samcake/black
Fix the local lights not working on AMD
2018-08-21 15:36:12 -07:00
sam gateau
30c0c44822 Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:52:42 -07:00
sam gateau
6b994ba39a Completely remove the texcoord frame transform as we don;t use it at all 2018-08-21 14:51:54 -07:00
sam gateau
b7d8b92fb5 Add comment in shader and fix bad cull mode 2018-08-21 12:25:27 -07:00
sam gateau
5ae604f341 REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD 2018-08-21 12:14:32 -07:00
John Conklin II
ad835597e6
Merge pull request #13779 from amantley/perspectiveBug
Perspective bug
2018-08-21 11:31:14 -07:00
SamGondelman
9ab1fc0500 Merge remote-tracking branch 'upstream/master' into perf 2018-08-20 17:04:42 -07:00
Sam Gateau
e60756cfe6 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 15:54:23 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
Sam Gateau
60765902fb Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-18 15:04:43 -07:00
Sabrina Shanman
99374c099a
Merge pull request #13816 from SamGondelman/fading
Fix parabola shader
2018-08-13 14:45:31 -07:00
SamGondelman
86ba8c3d81 fix parabola shader 2018-08-13 10:08:19 -07:00
Sam Gateau
d5cfe95a0a merging with master 2018-08-10 15:03:33 -07:00
John Conklin II
61f0e9323a
Merge pull request #13800 from samcake/zvork-shadow
Fixing PR13731 shader error on Mac
2018-08-10 14:10:47 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Sam
cd7ca96c3a Remove the separate depth buffer for in front overlay, only useful for debug and it breaks in mac 2018-08-10 02:42:45 +02:00
Sam
5fd3862c94 FIx shader error on mac in shadow.slh 2018-08-10 00:45:25 +02:00
SamGondelman
bba806f78c merge with master, fix uniform slots, use varyings for sigma 2018-08-08 22:27:22 -07:00
SamGondelman
a0c3c09b05 Merge remote-tracking branch 'upstream/master' into bloom 2018-08-08 14:44:02 -07:00
Sam Gateau
16bf46ea34 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 14:22:52 -07:00
Sam Gondelman
16b483b338
Merge pull request #13766 from SamGondelman/shaders
Miscellaneous shader fixes
2018-08-08 11:34:36 -07:00
Sam Gateau
7efd5964bd Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-08 09:28:14 -07:00
Sam Gateau
9295007d99 fixing the ui script and trying to get shadow 2018-08-08 09:22:31 -07:00
Olivier Prat
2584ce4c96 Merged with master 2018-08-08 08:42:44 +02:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
SamGondelman
2959a406d7 working on enabling bloom 2018-08-07 21:52:05 -07:00
amantley
274bf33318 fix for the avatar scale reset when we re-enter hmd mode 2018-08-07 18:29:51 -07:00
Sam Gondelman
9ec0b05fe4
Merge pull request #13776 from samcake/black
Fix bug with texel opaque and transparent cut off shader function
2018-08-07 15:52:18 -07:00
SamGondelman
de10dfb032 don't bind materials during shadow pass 2018-08-07 11:17:18 -07:00
Sam Gateau
07cb0db425 Fix bug with texel opaque and transparent cut off shader function 2018-08-07 11:16:50 -07:00
SamGondelman
82029b4cb0 fix v1 and transparent procedurals 2018-08-07 09:28:40 -07:00
Sam Gateau
aac49e901b merging with master (andthe big shader pr) 2018-08-07 09:16:30 -07:00
SamGondelman
a7dec8fb75 parabola and particle shader fixes 2018-08-06 15:49:52 -07:00
Sam Gateau
09d33177fc Adjust Workload and better representation of the workload debuging features 2018-08-06 15:36:25 -07:00
Brad Davis
dcdc3a323c Use defines for packed textures to satisfy both GLES and GL 4.1 2018-08-06 14:35:36 -07:00
Olivier Prat
8eb7ceb66a Fixed the bug with the thin dark lines at cascade shadow switches (hopefully) 2018-08-05 12:06:36 +02:00
Olivier Prat
d457cf45d5 Fixed bug with NaN shadow anti frustum leading to disappearing shadows on some occasions 2018-08-04 16:51:05 +02:00
Olivier Prat
92e64510ec Fixed draw frustum and draw aabb code 2018-08-04 15:58:24 +02:00
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Brad Davis
a1cd39f4c2 Fix some explicit bindings that should be binding, not location 2018-08-03 14:58:12 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -07:00
Brad Davis
eca803503c Fix resolution scaling 2018-08-03 14:58:12 -07:00