SamGondelman
aec7206901
get rid of overlay pipelines and just use forward rendering
2018-06-05 14:44:44 -07:00
Andrew Meadows
4329ea5240
Merge master' into 'workload'
2018-06-04 16:11:25 -07:00
samcake
386c0f9ab2
Re review adjustments
2018-05-31 12:16:57 -07:00
luiscuenca
60758dec8d
Check for null pointer
2018-05-31 11:32:45 -07:00
Sam Gateau
513acc529e
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
2018-05-30 23:31:54 -07:00
samcake
2e9076c71e
Clean up and trying to get ready for merge
2018-05-30 11:14:49 -07:00
samcake
873cabe284
Cleaning the code
2018-05-29 17:46:25 -07:00
Sam Gateau
2f94c43968
Removing the getLayer from the meshPArtPayload and check that it s working
2018-05-28 23:20:04 -07:00
Sam Gateau
678effdb48
Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey
2018-05-26 23:28:59 -07:00
samcake
221b513b19
Oh boy
2018-05-25 16:33:34 -07:00
samcake
559d436dfa
Fixing the merge conflicts
2018-05-24 16:57:10 -07:00
samcake
44a8d880fa
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-24 14:31:53 -07:00
John Conklin II
36d2baab60
Merge pull request #13214 from SamGondelman/primCrash
...
Fix crash in GL45Backend::do_drawIndexedInstanced
2018-05-24 13:33:06 -07:00
Andrew Meadows
d50da2babc
Merge 'master' into 'workload'
2018-05-23 14:51:05 -07:00
SamGondelman
9dfc61a452
possible fix for gl crash
2018-05-22 12:51:32 -07:00
samcake
f536f7b6c9
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-21 15:52:51 -07:00
samcake
2dc28a504c
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-21 15:52:42 -07:00
Sam Gateau
87989268bf
Merge pull request #13182 from jherico/feature/batch_pooling
...
Use pooled gpu batches
2018-05-21 15:47:55 -07:00
Brad Davis
9c26b2c1d3
Use pooled gpu batches
2018-05-21 13:53:44 -07:00
Sam Gateau
e1690a28e1
Merging with master
2018-05-20 23:04:11 -07:00
samcake
3aaa01788c
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-18 17:42:30 -07:00
Cristian Luis Duarte
c7edf72f71
Check isHazeEnabled() vs 0.0 to compile on GLES
2018-05-18 15:59:24 -03:00
Andrew Meadows
a23126a6b2
Merge 'master' into 'workload'
2018-05-18 07:38:02 -07:00
samcake
0cf87748cd
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-17 14:20:44 -07:00
Clement
da08d747dc
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-05-17 12:10:08 -07:00
samcake
735db27919
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-05-16 17:18:23 -07:00
samcake
adc8a07d3c
Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn
2018-05-16 13:14:14 -07:00
samcake
21e069c90c
Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa
2018-05-16 13:09:55 -07:00
samcake
179801dab6
FIxing the transparent ambient lighting bug
2018-05-15 17:22:28 -07:00
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name
...
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
2018-05-15 13:22:15 -07:00
Andrew Meadows
c7c4324b3c
Merge 'master' into 'workload'
2018-05-15 10:22:50 -07:00
Olivier Prat
d10b5a16f2
Turned off jitter with FXAA
2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a
Fixed bug with highlighting and TAA
2018-05-15 12:27:04 +02:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
...
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
Cristian Luis Duarte
9e9e1092d6
Add Opaques tasks into RenderForwardTask
2018-05-11 21:37:28 -03:00
Cristian Luis Duarte
e3d7d65186
Merge remote-tracking branch 'origin/master' into android_avatar_name
2018-05-11 18:48:34 -03:00
Olivier Prat
ec439086a2
Extended to other shaders
...
(cherry picked from commit 328f1dec9b
)
2018-05-10 15:41:34 -07:00
Olivier Prat
29355ba8fb
Fixed procedural shaders
...
(cherry picked from commit eab7dd6006
)
2018-05-10 15:41:04 -07:00
samcake
652c754373
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-09 15:16:48 -07:00
Cristian Luis Duarte
936a319e62
Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task.
2018-05-09 17:15:57 -03:00
SamGondelman
c2004debd5
test using highp floats everywhere for android
2018-05-07 11:41:19 -07:00
Sam Gateau
9b65e0771b
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-05 12:17:20 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
John Conklin II
7699a19267
Merge pull request #12992 from Zvork/procedural
...
Fixed procedural shaders
2018-05-04 15:35:57 -07:00
Sam Gateau
61c855a97b
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-05-03 20:15:07 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
samcake
6d251c4cd3
Bringing the work and refinment done in workload branch to master branch
2018-05-03 17:46:50 -07:00
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
Sam Gateau
361fe75dc3
Merge pull request #13078 from jherico/fix/14638
...
Make resource swapchains immutable
2018-05-02 17:21:45 -07:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Bradley Austin Davis
80f87f7a62
Make resource swapchains immutable, fix for 14638
2018-05-02 10:32:34 -07:00
Bradley Austin Davis
7bad849e67
Make resource swapchains immutable, fix for 14638
2018-05-02 10:29:40 -07:00
Clement
21213e81f4
Multiview support for priority queue
2018-05-01 18:03:21 -07:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background
...
Debug Draw rendering now is visible on background skybox
2018-04-27 15:56:44 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2
...
Batch compile more shaders
2018-04-27 14:55:57 -07:00
Bradley Austin Davis
acb21cc96a
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-27 10:50:47 -07:00
samcake
5db3eee4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 15:21:43 -07:00
Olivier Prat
328f1dec9b
Extended to other shaders
2018-04-25 18:56:18 +02:00
Olivier Prat
e37b18336a
Improved anti-aliasing on text
2018-04-25 12:08:08 +02:00
Olivier Prat
eab7dd6006
Fixed procedural shaders
2018-04-25 10:25:34 +02:00
Anthony J. Thibault
2136134ed0
Debug Draw rendering now is visible on background skybox
2018-04-24 14:28:08 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
samcake
382161659e
Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork
2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857
Fixing the crash on mac
2018-04-24 11:25:40 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash
...
Attempt to shutdown web surfaces more consistently
2018-04-24 10:15:25 -07:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert
...
Minimum entity dimension (1mm)
2018-04-23 13:40:53 -07:00
samcake
35bbc6e61f
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-23 10:20:22 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq
...
Fix AMD shader compilation
2018-04-23 10:17:35 -07:00
samcake
990ee83f04
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-23 10:07:58 -07:00
Sam Gateau
97934fe563
Adjusting the regulators and moving task to use chrono nad interesting tests
2018-04-23 00:07:00 -07:00
SamGondelman
ac7e8623bf
quiet shader warnings
2018-04-20 18:25:30 -07:00
Simon Walton
4973605bf7
Restore two makePrograms from previous commit
2018-04-20 17:52:40 -07:00
SamGondelman
d59f368ad6
hide menu, fix shaders
2018-04-20 17:38:38 -07:00
samcake
0f4aa7e27e
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 09:31:36 -07:00
Olivier Prat
46a1ff4dd2
Set jitter to O on RenderableWebEntityItems
2018-04-20 12:02:17 +02:00
Olivier Prat
c6d598cc88
Jitter is now set through a batch command
2018-04-20 10:52:50 +02:00
Olivier Prat
440e2b8452
Merged with master
2018-04-20 08:13:25 +02:00
Simon Walton
999e5beba1
Move linear pass down sample shader to deferred compile
2018-04-19 15:30:16 -07:00
Simon Walton
529d5517e5
Move antialiasing and velocity buffer makeProgram to deferred scheme
2018-04-19 15:30:16 -07:00
John Conklin II
11f509e57a
Merge pull request #12873 from Zvork/haze
...
Fix for weird color shifting of teleportation target in Rust domain
2018-04-19 14:11:47 -07:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
Olivier Prat
c8bef8651f
Fixed weird specular on hair an teleportation target! Was a stupid mistake...
2018-04-19 10:04:38 +02:00
samcake
52a4224442
Arg get me the feedback working!!!!
2018-04-18 18:16:06 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Olivier Prat
1c9d1f6c48
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
2018-04-18 09:06:23 +02:00
John Conklin II
86c9b8c61d
Merge pull request #12892 from SimonWalton-HiFi/batch-compile-shaders
...
Batch compile shaders
2018-04-17 15:47:32 -07:00
SamGondelman
901301485b
reorganizing shader defines to fix compilation errors
2018-04-17 15:11:56 -07:00
Olivier Prat
0800c5eeb9
Removed TAA from web shaders. With reduced jittering, jittering on these objects is less noticeable
2018-04-17 16:36:52 +02:00
Olivier Prat
6ec9378739
Used unjittered projection matrix for a sharper and more stable TAA
2018-04-17 15:13:03 +02:00
Olivier Prat
d0d974d4f5
Bizarelly the jitter was 2 pixel wide...?
2018-04-17 12:24:12 +02:00
Olivier Prat
08146a7618
Used previous projection matrix to limit overblur
2018-04-17 11:28:59 +02:00
Olivier Prat
89669b326b
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
2018-04-17 09:24:35 +02:00
samcake
b32be91bb1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 13:22:58 -07:00
Simon Walton
b2e736da70
Remove commented-out code
2018-04-16 11:57:14 -07:00
Sam Gateau
19aa49832b
Merge pull request #12750 from SamGondelman/androidPrimitives
...
Forward pipelines for primitives
2018-04-16 11:18:56 -07:00
Olivier Prat
f9cc4994df
Merge branch 'master' of http://github.com/highfidelity/hifi into haze
2018-04-16 14:00:33 +02:00