samcake
|
1b52d700a0
|
Merge pull request #6871 from Atlante45/feat/draw-call-info
Unify normal and named draw paths
|
2016-02-01 14:19:15 -08:00 |
|
Brad Hefta-Gaub
|
711787a997
|
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
Animate iff visible with step2 billboard removal
|
2016-02-01 13:54:25 -08:00 |
|
Atlante45
|
ad215f23c6
|
Deactivate SSBOs for now
|
2016-02-01 22:41:01 +01:00 |
|
James B. Pollack
|
8e75ce8232
|
Merge pull request #6967 from zzmp/fix/render-count
Render the correct maxDrawnItems
|
2016-02-01 13:34:33 -08:00 |
|
Anthony Thibault
|
b345df8002
|
Merge pull request #6987 from AndrewMeadows/better-ik
reduce hand-IK coupling to hip offset
|
2016-02-01 10:36:21 -08:00 |
|
Atlante45
|
5ac0350993
|
Don't fall through in switch case
|
2016-02-01 18:50:01 +01:00 |
|
Andrew Meadows
|
71664dffae
|
change string comparisons to be CaseSensitive
|
2016-02-01 09:50:01 -08:00 |
|
Atlante45
|
52885545ea
|
Use feature name for ifdef
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
838b637591
|
Don't capture raw draw calls during named calls processing
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
a5603140de
|
Fix for mac
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
8cf393bb59
|
Mac compatibility
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
8d4dab19c7
|
Only bind once per render batch
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
9e8a3f19e9
|
Revert max input slot changes
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
38a223b270
|
Split declareStandardTransform
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
71ecd1662c
|
Add correct vertex attrib divisor
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
6ee88c15ec
|
Use vbo for draw call infos
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
7471646569
|
Disable attrib vertex on normal passes
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
d639a838ad
|
set currentNamedCall during setupNamedCalls
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
670cfc263b
|
Capture draw call info and model xfm in batch
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
7e8ea4dc77
|
Update primitive instance rendering calls
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
1658c15cca
|
Reserve last input slot for draw call info
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
78cd4407db
|
Don't pass binding manually, link named call correctly
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
eb55e55367
|
Clear buffers between each batch render
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
6ff38bc32f
|
Make sure _currentDraw has correct value
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
3e027fc5c5
|
Use ssbo for model transforms
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
23cf72bd6c
|
Add multi draw to factored setup
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
6464fabd71
|
Update current draw call
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
ccb183e518
|
Unify Named/Normal calls
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
9e0af63441
|
Bind model transform as single buffer
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
bff2a2a8e5
|
Factor draw call updates
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
6463136240
|
start/stopNamedCall run in renderPassTransfer too
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
bd8f62504d
|
Capture DrawCallInfo during renderPassTransfer
|
2016-02-01 18:50:01 +01:00 |
|
Atlante45
|
4d6931c5a8
|
Add private start/stopNamedCall batch commands
|
2016-02-01 18:50:01 +01:00 |
|
Ryan Huffman
|
4ed38c4104
|
Merge pull request #6986 from birarda/injector-restart
fix for injector restart not restarting
|
2016-01-29 16:27:34 -08:00 |
|
Stephen Birarda
|
d7990bf88a
|
reset hasSentFirstFrame to false for double frame on first send
|
2016-01-29 14:55:08 -08:00 |
|
Andrew Meadows
|
de54a0ac4b
|
remove cruft
|
2016-01-29 14:51:24 -08:00 |
|
Stephen Birarda
|
d3028606c5
|
retart the nextFrame and frameTimer on injector restart
|
2016-01-29 14:47:27 -08:00 |
|
Andrew Meadows
|
14ec1b6295
|
reduce hand IK coupling to hip position
|
2016-01-29 14:28:56 -08:00 |
|
Andrew Meadows
|
a98459dfa8
|
minor IK optimization: changed accumulators only
|
2016-01-29 14:28:56 -08:00 |
|
Andrew Meadows
|
449d566d2a
|
properly track lowestMovedIndex
|
2016-01-29 14:28:56 -08:00 |
|
Andrew Meadows
|
48f6a9c05f
|
fix IK looping error after minor refactor
|
2016-01-29 14:28:56 -08:00 |
|
Andrew Meadows
|
7b3f688a17
|
pull CCD IK solution pass into protected method
|
2016-01-29 14:28:56 -08:00 |
|
Stephen Birarda
|
20cfe80036
|
use a vector instead of priority queue to avoid double sort
|
2016-01-29 14:04:45 -08:00 |
|
Stephen Birarda
|
8d17df338b
|
allow AIM event processing during repeated injection
|
2016-01-29 14:04:45 -08:00 |
|
Stephen Birarda
|
c91f8c7685
|
add debug for DDOS AC drop
|
2016-01-29 14:04:45 -08:00 |
|
Stephen Birarda
|
5551a05261
|
removed debug for queued check-ins
|
2016-01-29 14:04:45 -08:00 |
|
Stephen Birarda
|
e50e75cba7
|
drop assignment even if DDOS locks NL thread
|
2016-01-29 14:04:45 -08:00 |
|
howard-stearns
|
9601b65269
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible
|
2016-01-29 11:40:13 -08:00 |
|
Brad Hefta-Gaub
|
721a911cf1
|
Merge pull request #6972 from jherico/qml
Small QML Fixes
|
2016-01-29 09:57:15 -08:00 |
|
Brad Davis
|
c80193635b
|
Update input dialog to support choice selection
|
2016-01-28 21:19:21 -08:00 |
|