Commit graph

122 commits

Author SHA1 Message Date
Olivier Prat
69ace03919 Merged with master 2018-10-24 08:27:39 +02:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -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
Olivier Prat
6abffceb43 Mip generation texture slot is higher and doesn't interfere anymore 2018-10-16 09:39:32 +02:00
Clement
0634efbde9 CR 2018-10-09 12:11:55 -07: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
Olivier Prat
4c84ae02fa Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-10-02 18:13:57 +02:00
Olivier Prat
6fcd63ed64 Improved acnee issues 2018-10-02 15:08:39 +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
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Sam Gateau
faf489855c Packing the offsets and catching up performances 2018-09-28 02:13:08 -07:00
Olivier Prat
9cd963af95 Added generateTextureMipsWithPipeline function in batch 2018-09-27 10:26:51 +02: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
d92c62c742 Make android use the existing shared pointers 2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1 PR feedback 2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a More shared pointer deduplication 2018-09-12 15:04:35 -07:00
Brad Davis
9a435cdca2 Reduce needless smart pointer duplication 2018-09-12 15:04:35 -07:00
sam gateau
8c7781a6d4 use the std::chrono duration the way it should be 2018-09-11 15:57:57 -07:00
sam gateau
77586933c8 Merge and fix the default _value of GLquery so it is 0, not broken 2018-09-11 11:43:14 -07:00
sam gateau
840c8c95fd cleaning the code and comments 2018-09-11 09:34:42 -07:00
Olivier Prat
f12cd2e55a Merged with master 2018-09-11 10:19:40 +02:00
Sam Gateau
5e76a0c6d7 changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp 2018-09-10 22:55:12 -07:00
sam gateau
9350d6f36e removing performance counters 2018-09-07 15:35:10 -07:00
sam gateau
d979d02139 why did i do that? 2018-09-07 10:03:55 -07:00
sam gateau
38bfee7b72 Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer 2018-09-06 13:54:21 -07:00
sam gateau
5aa45b64d2 Adressing build warnings 2018-09-06 11:24:13 -07:00
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
8c23ecce8f Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-08-31 17:45:10 -07:00
Brad Davis
945982b1bd Working on pauses in tomb domain 2018-08-27 13:28:49 -07:00
Sam Gateau
1123ba2b0a exploring optimization in Backend for bffer bindings 2018-08-22 22:48:42 -07:00
sam gateau
8c5aab7fa0 tabs! 2018-08-21 12:30:31 -07:00
sam gateau
5ae604f341 REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD 2018-08-21 12:14:32 -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
a1a1a03bbc Fixing crash on exit, deferred debugging tool 2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Olivier Prat
aa115786e3 Invalidate uniform buffer cache when binding camera correction 2018-07-03 17:27:27 +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
samcake
df3d689098 Try mono threaded and profiled 2018-06-22 14:59:37 -07:00
Brad Davis
7e16325805 Unit testing cached and uncached shader loading 2018-05-24 12:42:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Brad Davis
6daffba18e Fixing populated / allocated tracking for textures 2018-05-21 11:51:05 -07:00
Brad Davis
fb101cf036 Fix logspam from texture transfer code 2018-05-18 14:51:26 -07:00
Brad Davis
91f1d93d4e Fix flicker while transferring texture data 2018-05-18 09:23:54 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
samcake
767e6b15f3 Fixing the local lighting on translucents bug 2018-05-03 11:42:06 -07:00
Bradley Austin Davis
80f87f7a62 Make resource swapchains immutable, fix for 14638 2018-05-02 10:32:34 -07:00
Olivier Prat
f5296e9d97 Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-24 17:17:52 +02:00
Olivier Prat
fbd06f7d5e Fixed compilation error on Android 2018-04-21 11:07:26 +02:00
Olivier Prat
c6d598cc88 Jitter is now set through a batch command 2018-04-20 10:52:50 +02:00
Olivier Prat
5dcb7f622a Fixed corrupted glViewport after call to generateMipWithPipeline 2018-04-19 17:34:11 +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
SamGondelman
901301485b reorganizing shader defines to fix compilation errors 2018-04-17 15:11:56 -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
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -07:00
Brad Davis
3b5948ad85 Merge branch 'gl_common' into bindless 2018-03-21 19:16:34 -07:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Brad Davis
ae8df7e24e Merge remote-tracking branch 'origin/gl_common' into HEAD 2018-03-21 12:35:17 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Brad Davis
659da9b0e4 Merge remote-tracking branch 'upstream/master' into gl_common 2018-03-20 09:18:56 -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