Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 19:29:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87278 commits 67 branches 56 tags 1.2 GiB
Commit graph

1280 commits

Author SHA1 Message Date
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police 
Case 19409, Case 19468: Fading fixes and shader cleanup
 2018-11-13 15:00:23 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
John Conklin II
9d404a6cf3
Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo 
case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)
 2018-11-12 10:45:52 -08:00
SamGondelman
1d1510e18e Merge remote-tracking branch 'upstream/master' into police 2018-11-09 13:32:41 -08:00
Zach Fox
1b2593fd26
CR round 4 2018-11-08 11:28:07 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Cristian Luis Duarte
c310d41af7 Change GPU_RESOURCE_BUFFER_SLOT1_TEXTURE to 36 2018-11-02 14:59:30 -03:00
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
SamGondelman
c4c4d2c98d possibly fix mac issues 2018-10-31 13:28:07 -07:00
SamGondelman
e8c5324e39 start removing branching 2018-10-25 11:59:04 -07:00
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
SamGondelman
0efbdc1ab5 merge with master 2018-10-23 14:33:57 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
SamGondelman
5652fa0b1e merge with master 2018-10-22 10:18:52 -07:00
Olivier Prat
5f3a299fd9 Merge with master 2018-10-22 14:02:24 +02:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
John Conklin II
1f06c87580
Merge pull request #14096 from Zvork/mipgen 
Added generateTextureMipsWithPipeline function in gpu::Batch
 2018-10-18 16:06:28 -07:00
SamGondelman
cce0981d6c Merge remote-tracking branch 'upstream/master' into police 2018-10-17 11:40:01 -07:00
Olivier Prat
6abffceb43 Mip generation texture slot is higher and doesn't interfere anymore 2018-10-16 09:39:32 +02:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Olivier Prat
cfcf6f05a2 Merge with master 2018-10-09 14:18:02 +02:00
sam gateau
8a05cc2ede FIx the bad world position evaluation in the new all in one call 2018-10-04 11:49:11 -07:00
sam gateau
ff24a99032 Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform 2018-10-02 11:18:20 -07:00
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07:00
Seth Alves
cb04894e33 try another way of fixing _spare warning 2018-09-28 14:53:05 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
SamGondelman
e069817978 more fixes 2018-09-27 14:18:43 -07:00
Olivier Prat
9cd963af95 Added generateTextureMipsWithPipeline function in batch 2018-09-27 10:26:51 +02:00
Sam Gateau
8923055e91 Exploring the bad peroformances 2018-09-27 00:15:34 -07:00
sam gateau
7cf7eaa7c8 Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape 2018-09-24 17:34:42 -07:00
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