Commit graph

484 commits

Author SHA1 Message Date
Olivier Prat
64a57047ac Merged with master 2018-09-06 12:01:10 +02:00
sam gateau
ce86e94e6f Add simple optim and instrumentation for tthe number of input buffer changes per frame" 2018-09-05 11:34:33 -07: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
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
Brad Davis
df031b5d93 Fix procedural rendering with custom uniforms 2018-08-03 14:58:12 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07: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
Sam Gateau
7b4b6bc3b8 Same fix as the point lighting flashing for rc69 in master 2018-06-22 14:59:37 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
SamGondelman
45289dea09 on mac, render unsupported bptc textures (skyboxes) as uncompressed 2018-05-21 14:27:18 -07:00
Brad Davis
6daffba18e Fixing populated / allocated tracking for textures 2018-05-21 11:51:05 -07:00
Brad Davis
3356486f27 Fix populated texture size tracking 2018-05-18 09:23:54 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
SamGondelman
c2004debd5 test using highp floats everywhere for android 2018-05-07 11:41:19 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
samcake
35bbc6e61f Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:20:22 -07:00
Olivier Prat
3548c55bd5 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-04-18 14:35:10 +02:00
SamGondelman
901301485b reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -07:00
Sam Gateau
27e728ff67 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-12 18:11:18 -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
SamGondelman
6ffdae0500 disable etc2/eac compression on 4.1 2018-04-06 15:38:29 -07:00
SamGondelman
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -07:00
samcake
fa35d659dc Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-04-03 17:56:41 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -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
Brad Davis
6fe75a3ca4 Breaking out common gpu-gl code 2018-03-09 16:39:47 -08: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
Brad Davis
bf1e5f1dbc Fix varaible allocated bindless textures 2018-03-07 16:00:14 -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
samcake
d91fb543f3 Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api 2018-02-28 17:15:40 -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
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
f5a2557a2e Merged with master 2018-02-19 17:28:39 +01: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
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08: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
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
Bradley Austin Davis
25b778be1d Tracking down remaining SOX crashes 2018-01-17 12:18:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor
Removed glColor reset hack in MeshPartPayload
2017-12-22 14:25:51 -08:00
Olivier Prat
72ef716b13 Fixed warnings on Mac and Ubuntu 2017-12-21 09:52:06 +01:00
Olivier Prat
0d34569b1a Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-21 08:22:35 +01:00
Olivier Prat
bd666406f4 Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends 2017-12-19 14:17:17 +01: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
Olivier Prat
4abc428518 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-14 17:57:47 +01:00
Olivier Prat
5ad69afa8a Added support for INT_2_10_10_10_REV format 2017-12-14 14:18:56 +01:00
Sam Gateau
a75010fb94
Merge pull request #11938 from Zvork/csm
Cascaded Shadow Maps and bug fix
2017-12-14 00:32:43 +07:00
SamGondelman
ae625306ff remove getDedicatedMemory 2017-12-11 14:54:29 -08:00
Olivier Prat
1ce1aca79f Merged with samcake's 'black' branch 2017-12-07 08:59:38 +01:00
Olivier Prat
ac0e816f8c Cascade selection working on shadow but not in Luci debug mode 2017-11-13 18:42:34 +01:00
Olivier Prat
7011fd3731 Removed Mac and Ubuntu warnings 2017-10-23 15:46:11 +02: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
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
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
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
dbeb4e9b27 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-11 15:25:58 -07:00
Bradley Austin Davis
eb8b892571 Various Mac fixes 2017-09-07 14:45:35 -07:00
samcake
e70f261de4 Adding the full code path, starting debugging the problems in hmd, 2017-09-05 18:09:46 -07:00
samcake
800e4cb4d7 Messing around with the velocity buffer 2017-08-16 18:29:59 -07:00
samcake
2f0eee5e4a introducing the Velocity buffer pass generation 2017-08-15 18:11:23 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2
Fade dissolve effect  JUST AVATARS
2017-08-10 13:48:30 -07:00
Seth Alves
6f9460162d avoid calling a pure virtual function from GLBackend dtor 2017-08-06 12:47:45 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Olivier Prat
10a6ad2ac9 Added 3 more texture coord vec4f stream attributes 2017-07-18 10:58:49 +02:00
Olivier Prat
d9a83539b2 Merged with master 2017-07-03 15:32:30 +02:00
Olivier Prat
6a31dc2659 Selection of edited object working 2017-06-29 12:13:55 +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
Brad Davis
416852c0cd Fix warnings about creating QObjects with parents in different thread 2017-06-23 10:19:16 -07: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
ed6620fc51 Merge pull request #10718 from jherico/frame_thread
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00