Brad Davis
61ce66a039
Switching texture backing to opaque storage type
2017-02-17 13:03:03 -08:00
Brad Davis
eafe0a04d5
Fix transfer buffering
2017-02-17 13:00:38 -08:00
Brad Davis
285222d490
Add view storage
2017-02-17 12:49:55 -08:00
samcake
e6c6cd2825
cleaner unserialization
2017-02-17 12:24:04 -08:00
samcake
2d7ba45667
FIx creationg issue , need a usageType at creation
2017-02-17 12:01:33 -08:00
Brad Davis
d1b91cb436
Adding abstracted storage for in-memory or file backed data
2017-02-17 10:13:08 -08:00
sam
b4745657e0
progressing on io with ktx
2017-02-17 07:58:10 -08:00
sam
0d2e764bfd
CLeaning the read case
2017-02-17 07:55:19 -08:00
sam
6771cc31e1
Adding the reading path
2017-02-17 07:55:18 -08:00
samcake
3f0ea1c889
Address review comments
2017-02-17 07:55:16 -08:00
sam
d56f982dec
Maybe saving the first ktx textures, testing the save pipeline
2017-02-17 07:54:17 -08:00
samcake
cf9fc17c4d
Starting to work on the writer side
2017-02-17 07:54:14 -08:00
samcake
894f1b8e66
DOne with the parsing side of things
2017-02-17 07:54:13 -08:00
sam
115251542d
Adding the ktx library
2017-02-17 07:54:12 -08:00
Brad Davis
1f058f069e
First pass at new texture transfer logic
2017-02-17 07:53:51 -08:00
Brad Davis
75c17e89a2
Fix OpenGL 4.1 texture loading
2017-02-17 07:53:24 -08:00
Brad Davis
066a6483a0
Code comments
2017-02-17 07:53:23 -08:00
Brad Davis
439cb388f2
Increase the rate of work queue processing
2017-02-17 07:53:22 -08:00
Brad Davis
35a6359d59
Fixing transfer logic, adding stats display & profile ranges
2017-02-17 07:53:21 -08:00
Brad Davis
283ff01038
Remove duplicate code, polish
2017-02-17 07:53:20 -08:00
Brad Davis
0d89b3a922
Better sampler handling
2017-02-17 07:53:19 -08:00
Brad Davis
fe5c511eeb
Fix texture count
2017-02-17 07:53:18 -08:00
Brad Davis
1238edd0d7
Add incremental transfers for large mips
2017-02-17 07:53:17 -08:00
Bradley Austin Davis
7fb7aa87eb
Working on new texture management strategy
2017-02-17 07:53:16 -08:00
Stephen Birarda
a3c123818d
Merge pull request #9661 from Atlante45/fix/possible-race
...
Fix possible race condition
2017-02-15 18:38:01 -08:00
David Kelly
5ec3bbde52
Merge pull request #9648 from davidkelly/dk/zoneFilters2
...
Zone Filters
2017-02-15 13:36:11 -07:00
David Kelly
f0e87360c1
don't capture a temporary by reference. Ugh
2017-02-15 12:37:00 -07:00
Clément Brisset
eba6a8f028
Merge pull request #9674 from Atlante45/fix/mac-macro
...
Fix SSE2 macros for Macs
2017-02-15 11:29:55 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Zach Pomerantz
ed4f96eadd
Merge pull request #9646 from zzmp/load/audio/packets-in
...
log full i/o stats
2017-02-15 13:32:48 -05:00
Chris Collins
d1a236954b
Merge pull request #9673 from zzmp/audio/threaded-decode
...
Parallelize audio packet decoding in mixer
2017-02-15 09:44:42 -08:00
David Kelly
e6969321ca
fix for not properly filtering entity adds
2017-02-15 09:15:35 -07:00
Zach Pomerantz
2f52c09320
alphabetize io_stats
2017-02-14 23:17:11 +00:00
Zach Pomerantz
276c1abd0a
Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in
2017-02-14 23:06:36 +00:00
Atlante45
1201932ee9
Fix SSE2 macros for Macos
2017-02-14 14:10:53 -08:00
David Kelly
08d30608c7
remove debug logging
2017-02-14 14:28:20 -07:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Zach Pomerantz
6f2eb27572
rm debug in Deck.cpp
2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582
move codec negotiation to client data
2017-02-14 20:46:27 +00:00
David Kelly
17acd8fa4f
I should just build on linux exclusively
2017-02-14 13:30:43 -07:00
David Kelly
342584b2a8
Filter failure mode updated
...
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.
Also - zone filters don't apply to the zone itself. Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
2017-02-14 13:05:12 -07:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Seth Alves
2e2a3c60d0
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-14 06:26:20 -08:00
Seth Alves
2e245e9cba
Merge pull request #9667 from huffman/fix/entity-scripts-not-loading
...
Fix entity scripts not loading in certain cases
2017-02-14 06:20:29 -08:00
Seth Alves
30c46b89a0
Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect
...
Removed ColorOverlay from TabletButton, added more icon & text states
2017-02-14 06:16:59 -08:00
howard-stearns
487adc7f18
whitespace
2017-02-13 16:35:03 -08:00
Anthony J. Thibault
1c783031b1
Removed ColorOverlay from TabletButton, added more icon & text states
...
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.
* icon
* hoverIcon
* activeIcon
* activeHoverIcon
* text
* hoverText
* activeText
* activeHoverText
Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
Ryan Huffman
d0cddd01d7
Fix entity scripts not loading in certain cases
...
This fixes a bug where an entity script would be loaded but immediately
unloaded. This happens when the script property of the entity is changed shortly
after it is added.
Flow of events:
Entity added
=> Entity added event emitted
Entity edited
=> Script changing event emitted
<= Entity added event received
Script loaded
<= Script changing event received
Script stopped
Tries to load script again, but because the script hasn't changed
since it was last loaded, it is not loaded again.
The change here is to modify the behavior when receiving a script
changing event. Instead of always unloading and then conditionally
loading the script, it will either do both (unload + load) or neither.
2017-02-13 14:59:31 -08:00
