sam gateau
|
609bc6385e
|
Merge branch 'black' of github.com:samcake/hifi into black-bis
|
2018-09-18 17:40:45 -07:00 |
|
sam gateau
|
ec6117e9bb
|
bringing the blendshape in skin shader only work in master
|
2018-09-18 17:40:29 -07:00 |
|
Olivier Prat
|
acab748f57
|
Merge with master
|
2018-09-17 14:29:54 +02:00 |
|
Sam Gateau
|
986dece4ec
|
Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood
|
2018-09-14 20:24:22 -07:00 |
|
Brad Davis
|
cfff28ad0a
|
More shared pointer deduplication
|
2018-09-12 15:04:35 -07:00 |
|
Olivier Prat
|
f12cd2e55a
|
Merged with master
|
2018-09-11 10:19:40 +02:00 |
|
Sam Gateau
|
47cea49f78
|
Merge pull request #13922 from samcake/black-bis
Optimize the vertex formats of meshes for less input buffer bindings
|
2018-09-10 16:58:40 -07:00 |
|
Sam Gateau
|
082d47d20f
|
Set the correct assert in replacment of the unecessary if branch
|
2018-09-10 14:31:49 -07:00 |
|
sam gateau
|
7349562111
|
Removing commented code
|
2018-09-06 15:50:31 -07:00 |
|
Bradley Austin Davis
|
fade3a8de0
|
Fixing shader implicit type conversions
|
2018-09-06 09:08:36 -07:00 |
|
Brad Davis
|
9a28e04e37
|
Remove all tabs from shaders
|
2018-09-06 08:59:07 -07:00 |
|
Brad Davis
|
271651737b
|
Cleanup gpu shader constants
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
cafd981744
|
Remove uniforms from bloom debug effect
|
2018-09-06 08:59:06 -07:00 |
|
Brad Davis
|
c8eb4da6b6
|
Remove simple draw task uniforms
|
2018-09-06 08:59:05 -07:00 |
|
Olivier Prat
|
64a57047ac
|
Merged with master
|
2018-09-06 12:01:10 +02:00 |
|
Sam Gateau
|
e8d922a56c
|
Interleaving the attributes and relying on just 3 input buffers
|
2018-09-03 02:48:07 -07:00 |
|
Sam Gateau
|
1123ba2b0a
|
exploring optimization in Backend for bffer bindings
|
2018-08-22 22:48:42 -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 |
|
Sam Gondelman
|
5f4f232602
|
Merge pull request #13604 from huffman/feat/oven-etc2
Add ETC2 support to Oven
|
2018-08-15 13:55:44 -07:00 |
|
Brad Davis
|
f03370c826
|
Migrating to scribe program descriptors
|
2018-08-09 17:58:34 -07:00 |
|
Stephen Birarda
|
e686df6fb9
|
Merge pull request #13720 from Atlante45/feat/test-tool
Stack tester changes
|
2018-08-08 13:40:05 -04:00 |
|
Ryan Huffman
|
6be0c43fca
|
Update generateIrradiance to take a BackendTarget
|
2018-08-08 10:00:02 -07:00 |
|
Bradley Austin Davis
|
fc51b93691
|
Fix OSX build
|
2018-08-03 16:15:58 -07:00 |
|
Brad Davis
|
eca803503c
|
Fix resolution scaling
|
2018-08-03 14:58:12 -07:00 |
|
Brad Davis
|
8eb97dc79c
|
PR feedback
|
2018-08-03 14:58:12 -07:00 |
|
Brad Davis
|
ae8f841912
|
Shader refactoring for explicit bindings
|
2018-08-03 14:58:11 -07:00 |
|
Brad Davis
|
04e84f1d23
|
Moving to cmake time shader compiling
|
2018-08-03 14:58:11 -07:00 |
|
Clement
|
333cbc99ad
|
Remove static logging
|
2018-07-30 17:18:32 -07:00 |
|
SamGondelman
|
1c1b68ee66
|
emitterShouldTrail fix, review comments, rotateWithEntity
|
2018-07-26 11:41:16 -07:00 |
|
John Conklin II
|
3f975cfa84
|
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
|
2018-07-02 15:27:26 -07:00 |
|
Olivier Prat
|
419e8e6eb9
|
Forgot to put back linear filtering on single shadow map
|
2018-07-02 11:32:33 +02:00 |
|
Sam
|
a6cbc44885
|
Merged with zvork fix
|
2018-07-02 10:50:37 +02:00 |
|
Sam
|
c1856a5e36
|
Make shadows work with one cascade
|
2018-07-02 10:46:53 +02:00 |
|
Olivier Prat
|
de831ffea9
|
Switched shadow maps to sampler2DArrayShadow to try to fix on Mac
|
2018-06-29 16:55:33 +02:00 |
|
sabrina-shanman
|
4afb19e091
|
Remove assert in ~Frame causing shutdown crash on Mac in dev build
|
2018-06-27 09:59:48 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
SamGondelman
|
7771661948
|
fix particle spread properties
|
2018-06-15 17:35:49 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Andrew Meadows
|
5a3350950b
|
check pointer validity before dereference
|
2018-06-15 11:43:52 -07:00 |
|
Sam Gondelman
|
ae3b933a80
|
Merge branch 'master' into etc2comp
|
2018-05-30 17:17:03 -07:00 |
|
Bradley Austin Davis
|
3beb77694f
|
Cached shader binaries and uniform data for shaders
|
2018-05-24 12:42:33 -07:00 |
|
Brad Davis
|
9c26b2c1d3
|
Use pooled gpu batches
|
2018-05-21 13:53:44 -07:00 |
|
SamGondelman
|
12b91a2ab7
|
compress skyboxes
|
2018-05-18 13:18:43 -07:00 |
|
Brad Davis
|
ae07036f20
|
Add ideal resource texture memory stat
|
2018-05-18 09:23:53 -07:00 |
|
SamGondelman
|
6b268191c8
|
local compression, patched etc2comp
|
2018-05-15 14:05:21 -07:00 |
|
John Conklin II
|
b9656e5c72
|
Merge pull request #13130 from samcake/blue
Fix size calculation of compressed textures #13120
|
2018-05-09 11:45:10 -07:00 |
|
samcake
|
44e7541888
|
Fixing the size evaluation for compressed texture and gpu::Element Type enum
|
2018-05-08 15:57:27 -07:00 |
|
Seth Alves
|
677c99abd4
|
use memcpy on _usageType as well
|
2018-05-05 20:50:54 -07:00 |
|
Seth Alves
|
6a55e67ce9
|
avoid misaligned pointer deref
|
2018-05-05 16:39:03 -07:00 |
|
Stephen Birarda
|
ec354620db
|
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
Add support for client texture selection
|
2018-05-04 16:14:43 -07:00 |
|
samcake
|
767e6b15f3
|
Fixing the local lighting on translucents bug
|
2018-05-03 11:42:06 -07:00 |
|
Bradley Austin Davis
|
64d442b281
|
Change type used for swap chain count
|
2018-05-02 10:32:44 -07:00 |
|
Bradley Austin Davis
|
80f87f7a62
|
Make resource swapchains immutable, fix for 14638
|
2018-05-02 10:32:34 -07:00 |
|
Ryan Huffman
|
24ac342c6b
|
Add support for client texture selection
|
2018-05-01 14:11:31 -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
|
57ff1c54e1
|
Created shared c++/glsl header for transformcamera
|
2018-04-20 09:01:19 +02:00 |
|
Olivier Prat
|
7e78e79685
|
Created median shader for AO depth mip creation but generateMipWithPipeline not working
|
2018-04-18 17:20:16 +02:00 |
|
Olivier Prat
|
3548c55bd5
|
Merge branch 'master' of http://github.com/highfidelity/hifi into ao
|
2018-04-18 14:35:10 +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
|
89669b326b
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
|
2018-04-17 09:24:35 +02:00 |
|
Sam Gateau
|
3ac4a1db2d
|
Merge pull request #12850 from SimonWalton-HiFi/early-trace
Enable Interface tracing from earliest execution point
|
2018-04-16 10:24:55 -07:00 |
|
John Conklin II
|
3d90f93cf1
|
Merge pull request #12812 from SamGondelman/compression
Support ETC2/EAC compressed textures
|
2018-04-12 16:04:08 -07:00 |
|
Olivier Prat
|
644ef33730
|
First draft at batch generateTextureMipsWithPipeline
|
2018-04-12 17:58:05 +02:00 |
|
Simon Walton
|
adcf991125
|
Improvements to profiling data capture
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
|
2018-04-11 17:36:32 -07:00 |
|
Sam Gateau
|
167db14bdb
|
restoring the sampler desc layout to fix ktx cache and fixing the bug shadow when turning global shadow on off
|
2018-04-11 00:00:11 -07:00 |
|
Simon Walton
|
9b6306601a
|
Merge Clement's PR12700 diffs for early trace start
|
2018-04-10 13:13:46 -07:00 |
|
Olivier Prat
|
3c4409c5e1
|
Merge with master
|
2018-04-10 09:16:08 +02:00 |
|
SamGondelman
|
44ea5a2e84
|
add etc2/eac support
|
2018-04-05 18:59:22 -07:00 |
|
Brad Davis
|
ae8df7e24e
|
Merge remote-tracking branch 'origin/gl_common' into HEAD
|
2018-03-21 12:35:17 -07:00 |
|
Olivier Prat
|
f0a7a9b21c
|
Merged with master
|
2018-03-20 10:24:41 -07:00 |
|
Brad Davis
|
c793a8d2c0
|
Move bindless compile time flag to GL45 backend, fix warnings and compile errors
|
2018-03-12 16:50:08 -07:00 |
|
Brad Davis
|
9056ee0f14
|
Merge branch 'gl_common' into bindless
|
2018-03-12 11:27:30 -07:00 |
|
Olivier Prat
|
da6bd92ff6
|
Merged with master
|
2018-03-09 10:07:25 +01:00 |
|
Brad Davis
|
09996e0b65
|
Bindless texture work cleanup
|
2018-03-08 16:01:18 -08:00 |
|
Brad Davis
|
ddd60ded03
|
Merge remote-tracking branch 'upstream/master' into bindless_master
|
2018-03-07 16:04:35 -08:00 |
|
Sam Gondelman
|
f51a35455a
|
Merge pull request #12515 from SamGondelman/scriptableMaterials
Material reflection
|
2018-03-07 14:29:31 -08:00 |
|
Brad Davis
|
f9605cffb1
|
Target available mip
|
2018-03-06 11:20:54 -08:00 |
|
Bradley Austin Davis
|
b7d0260a17
|
Fix the uniform target for bindless
|
2018-03-06 09:11:50 -08:00 |
|
Olivier Prat
|
bf70e1d4ee
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taapre
|
2018-02-28 09:16:31 +01: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 |
|
Olivier Prat
|
419e064e65
|
Moved antialiasing before tonemapping
|
2018-02-26 14:57:59 +01: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
|
ab5355dbdd
|
First pass at bindless textures
|
2018-02-08 11:11:36 -08:00 |
|
samcake
|
03aeb7adda
|
Adding the ubo slot assignment for the resource texture table
|
2018-02-08 11:08:23 -08:00 |
|
samcake
|
536ada3973
|
Introducing the TextureTable in the gpu shader system
|
2018-02-08 11:00:37 -08:00 |
|
samcake
|
ea23d8283f
|
Introducing the TextureTable in the gpu shader system
|
2018-02-08 10:56:50 -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 |
|
Sam Gondelman
|
6814dfcbfc
|
weak_ptr _cacheFile
|
2017-12-17 22:09:20 -08:00 |
|
Sam Gondelman
|
6990dda48d
|
cr and cleanup
|
2017-12-17 16:11:55 -08:00 |
|
SamGondelman
|
3ae52c0e0e
|
clear all _cacheFiles on recycle
|
2017-12-15 17:52:48 -08:00 |
|
SamGondelman
|
52c4aef721
|
keep _cacheFile alive
|
2017-12-15 16:23:53 -08:00 |
|
Olivier Prat
|
f38e473218
|
Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats
|
2017-12-14 17:57:34 +01:00 |
|
Olivier Prat
|
5ad69afa8a
|
Added support for INT_2_10_10_10_REV format
|
2017-12-14 14:18:56 +01:00 |
|
Olivier Prat
|
92e1fe8e5c
|
Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug
|
2017-12-08 18:02:27 +01:00 |
|
samcake
|
e0110ff7e6
|
Merging with upstream
|
2017-12-07 09:23:38 -08:00 |
|
Olivier Prat
|
1ce1aca79f
|
Merged with samcake's 'black' branch
|
2017-12-07 08:59:38 +01:00 |
|
Olivier Prat
|
dd6b7b04c2
|
Merged with master
|
2017-11-13 14:33:59 +01:00 |
|
Olivier Prat
|
bbcb0b2d9b
|
Fixed highlight in stereo mode, including HMD (testing on simulator)
|
2017-11-08 13:49:18 +01:00 |
|
Olivier Prat
|
0bbd1edc0a
|
Fixed fluttering highlight bug by attaching only stencil when drawing outline
|
2017-11-07 18:26:15 +01:00 |
|
Olivier Prat
|
bced566510
|
Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo
|
2017-10-27 10:45:43 +02:00 |
|
Olivier Prat
|
ae8a9e68c8
|
Added debug tool to view shadow & view frustums
|
2017-10-25 11:58:16 +02:00 |
|
SamGondelman
|
046e5ca716
|
fix backwards HUD in mirror mode
|
2017-10-24 13:24:09 -07:00 |
|
Sam Gateau
|
ec934335dc
|
CLeaning up the pr regarding the scripts with my branch blue
|
2017-10-15 22:34:58 -07:00 |
|
Olivier Prat
|
049e3d47b6
|
Preparing for support of multiple concurrent outlines by adding mask id buffer
|
2017-10-13 10:23:42 +02:00 |
|
Sam Gateau
|
f143c28625
|
Merge pull request #11542 from SamGondelman/bubbleBoy
Move HUD and HUD overlay rendering out of display plugin
|
2017-10-10 14:26:20 -07:00 |
|
Olivier Prat
|
db9a9e723c
|
Merged with master
|
2017-10-10 12:11:23 +02:00 |
|
samcake
|
6639287418
|
Merging with master
|
2017-10-02 17:03:09 -07:00 |
|
SamGondelman
|
b59ec07171
|
move hud rendering to render thread, still need to separate out hud overlays
|
2017-09-29 09:49:08 -07:00 |
|
Olivier Prat
|
23c77d528a
|
Merged with master with new abotProcessing in image
|
2017-09-25 09:48:24 +02:00 |
|
Olivier Prat
|
98820f720d
|
KTX serialization / unserialization working with compressed HDR. Not sure with packed floats
|
2017-09-21 13:17:25 +02:00 |
|
Olivier Prat
|
5699dc6f42
|
Added KTX support of compressed HDR and HDR formats
|
2017-09-21 10:03:05 +02:00 |
|
Olivier Prat
|
5ec9c5bb45
|
Fixed some coding standard issues
|
2017-09-21 09:32:34 +02:00 |
|
Bradley Austin Davis
|
b93e91b9f3
|
New android toolchain
|
2017-09-19 13:45:12 -07:00 |
|
Olivier Prat
|
b8065d46ce
|
Fixed bugs with conversion to packed floats
|
2017-09-13 19:15:51 +02:00 |
|
Olivier Prat
|
aab63bf109
|
Added support for R11G11B10F and RGB9E5 cubemaps. Weird colors though but it doesn't crash
|
2017-09-13 14:32:22 +02:00 |
|
samcake
|
9335acc887
|
Merge and a lot of rewriting the color conversion
|
2017-08-24 18:02:11 -07:00 |
|
SamGondelman
|
4c55849290
|
merge from master
|
2017-08-10 15:43:23 -07:00 |
|
Olivier Prat
|
490aad2a06
|
Merged from master
|
2017-07-31 12:00:35 +02:00 |
|
Sam Gondelman
|
fcaa39b245
|
Merge branch 'master' into sharks
|
2017-07-26 18:18:09 -07:00 |
|
SamGondelman
|
3c8b964cc9
|
replace setHandLasers with drawHUDLayer overlay property
|
2017-07-24 18:16:40 -07:00 |
|
Seth Alves
|
6e0394865e
|
fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset
|
2017-07-23 08:05:09 -07:00 |
|
Olivier Prat
|
3316be4dea
|
Working fade parameters through instanced draw calls
|
2017-07-18 17:01:17 +02:00 |
|
Olivier Prat
|
10a6ad2ac9
|
Added 3 more texture coord vec4f stream attributes
|
2017-07-18 10:58:49 +02:00 |
|
Sam Gateau
|
93963b3257
|
Apply the projection and deferred transform fixes found while working on spectator camera
|
2017-06-28 15:44:17 +02:00 |
|
Zach Fox
|
cbdffce88e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
|
2017-06-19 13:53:29 -07:00 |
|
Brad Davis
|
1d4b443113
|
Prevent cache ejection of textures in use
|
2017-06-19 09:51:11 -07:00 |
|
samcake
|
4c8eec4e16
|
Introducing a way to prevent a frame to render in stereo accross batches
|
2017-06-08 17:38:26 -07:00 |
|
samcake
|
82d348a2ef
|
Stencil rejection is working, and more cleaning
|
2017-05-31 16:46:20 -07:00 |
|
Sam Cake
|
32c5dac66a
|
Big cleanup of unecessary shaders and legacy from deferred lighting, and messing around with the stencil
|
2017-05-31 00:55:28 -07:00 |
|
samcake
|
8559ed6260
|
Starting to add the stencil mask for hmd
|
2017-05-30 16:37:10 -07:00 |
|
Sam Gateau
|
5b0d2f32b4
|
Merge pull request #10458 from jherico/ktx_validation
Add KTX validation routines
|
2017-05-25 16:02:23 -07:00 |
|
Brad Davis
|
6490c52245
|
Do not allow divide by zero on assigning mip data
|
2017-05-24 13:02:54 -07:00 |
|
Brad Davis
|
191b633081
|
Refactor KTX defines and validation
|
2017-05-24 11:15:34 -07:00 |
|
samcake
|
653abf0ee3
|
brining the new counters to 4.1
|
2017-05-22 17:34:06 -07:00 |
|
samcake
|
e0487f7e04
|
Solving the size evaluation for compressed format
|
2017-05-22 16:51:54 -07:00 |
|
Brad Davis
|
3995f539cf
|
Merge pull request #10500 from Atlante45/feat/bc7
Add BC7 compression support
|
2017-05-22 16:47:27 -07:00 |
|
samcake
|
e4f9f2935e
|
Solving the size evaluation for compressed format
|
2017-05-22 15:42:18 -07:00 |
|
Sam Cake
|
1f090d8148
|
Debugging the size problem and fixing the compression size evaluation
|
2017-05-22 01:00:34 -07:00 |
|
samcake
|
56e9b1bb37
|
Adding the populated counter
|
2017-05-19 18:46:19 -07:00 |
|
samcake
|
c5b5aa93b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-19 18:13:42 -07:00 |
|
samcake
|
c449229850
|
Cleaned up the counters for memory
|
2017-05-19 17:52:56 -07:00 |
|
Ryan Huffman
|
26247e8653
|
Add check for valid mutableData in assignMipData
|
2017-05-19 15:00:53 -07:00 |
|
Ryan Huffman
|
64bf5784e6
|
Fix FileStorage to not close files after they are opened
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
|
2017-05-19 11:16:20 -07:00 |
|
Ryan Huffman
|
c36b85bb05
|
Add notes to KtxStorage::maybeOpenFile
|
2017-05-19 11:11:00 -07:00 |
|
Atlante45
|
a8b1a29a4a
|
Add support for BC7 compression
|
2017-05-18 13:11:41 -07:00 |
|
samcake
|
9c154122d3
|
Introdicing the format factor and merging with master becasue of protocol change...
|
2017-05-18 13:08:13 -07:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Brad Hefta-Gaub
|
fbc32e5ba1
|
Merge pull request #10485 from samcake/orange
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-18 08:47:58 -07:00 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
samcake
|
b19b0007c8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-17 13:02:37 -07:00 |
|
samcake
|
ab3ea65d54
|
Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-17 12:36:12 -07:00 |
|
samcake
|
b466964817
|
REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior
|
2017-05-16 18:21:24 -07:00 |
|
Ryan Huffman
|
e0212ac32b
|
Remove _fullImageSize from ktx header
|
2017-05-16 15:53:07 -07:00 |
|
Ryan Huffman
|
bfd1274ed3
|
Fix progressive loading of cubemaps
In various places we were using the KTX _imageSize as the size of the
entire mip level, when it is actually the size of the face for cubemaps.
|
2017-05-16 15:12:47 -07:00 |
|
samcake
|
d734358290
|
Adding a comment for debug sake
|
2017-05-12 18:15:00 -07:00 |
|