Commit graph

1290 commits

Author SHA1 Message Date
Brad Davis
3c6e98f16b New format for captured GPU frames 2019-10-04 08:34:06 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
Sam Gateau
224e9590ec avoid using explicit dialects when we want just a default one 2019-08-13 15:45:24 -07:00
Sam Gateau
0b470b9ab8 Fixing the bad location assignment on gl41 on windows with Austin's help 2019-08-13 00:22:17 -07:00
Brad Davis
449f3d00f9 BUGZ-987: fix depth testing of HUD layer 3D objects 2019-07-23 12:09:12 -07:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
Anna
95f2dfa551 added horizontal flip back to mirror mode 2019-07-01 15:31:26 -07:00
Anna
787359fdfb fixed ui flipping issue 2019-07-01 10:52:03 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
Seth Alves
c5e1f2aedc change ContextStats::evalDelta to better handle wrapping values in graphics stats 2019-06-11 11:56:49 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
SamGondelman
dc3b2d97e3 fix the actual problem 2019-05-24 09:36:37 -07:00
SamGondelman
3eac2cf1d6 (づ。◕‿‿◕。)づ 2019-05-16 18:31:45 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
SamGondelman
6ce6877dfa Merge remote-tracking branch 'upstream/master' into textureUsage 2019-04-25 15:05:27 -07:00
SamGondelman
a66c515c2a fix url issue and always generateIrradiance 2019-04-25 11:36:29 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
SamGondelman
4fc97effda combine snapshotOperator lists per sam's suggestions 2019-04-22 16:22:18 -07:00
SamGondelman
e7d12dc4f8 fix snapshots and preview 2019-04-17 15:43:05 -07:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
Brad Davis
ad2c4718a3 Fix loading relative files 2019-03-19 09:32:44 -07:00
Sam Gateau
b563f21037 Fix comments 2019-02-25 09:32:27 -08:00
Sam Gateau
4ee2b43229 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 20:49:51 -08:00
Sam Gateau
26ad42b965 FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders 2019-02-24 19:07:56 -08:00
amer cerkic
bf69e6d672 fixing compile errors 2019-02-19 16:03:02 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Brad Davis
bfda7d73c1 Fix frame player 2019-02-15 16:39:36 -08:00
Sam Gateau
fc1d3df613 Merge branch 'brown' of github.com:samcake/hifi into brown 2019-02-14 15:44:26 -08:00
Sam Gateau
98a5ec84a9 Adjusting the HUD operator render job to shave an extra framebuffer 2019-02-14 15:35:02 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal
Case 21147, Case 20944: Fix setTextures (pal, etc.)
2019-02-13 17:50:08 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
Brad Davis
db121957d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-12 15:00:03 -08:00
Sam Gateau
9ad783135c Bringing back brownBis to just msaa support 2019-02-11 19:42:05 -08:00
Sam Gateau
db30857b87 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 13:21:34 -08:00
Brad Davis
b1eb0b0a46 GPU tweaks 2019-01-30 16:23:21 -08:00
Brad Davis
c46d73128b Merge branch 'feature/quest_frame_player' into feature/quest 2019-01-30 16:16:51 -08:00
Brad Davis
a310eec41e Support relative paths in serialized frames 2019-01-30 13:15:23 -08:00
Brad Davis
f490a6c231 GPU tweaks 2019-01-30 13:15:23 -08:00
Brad Davis
f146c9fe77 Quest frame player work 2019-01-30 10:17:57 -08:00
Sam Gateau
e39a6b5a7d Merging with master 2019-01-28 17:58:17 -08:00
Brad Davis
b1e4e17f47 Santa Cruz 2019-01-28 15:52:36 -08:00
Brad Davis
81a7fa17bf PR feedback 2019-01-25 11:14:40 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Brad Davis
6fb869126e GPU state cleanup 2019-01-22 10:37:08 -08:00
Sam Gateau
f9891775fc Enabling msaa framebuffer and testing for forward 2019-01-21 23:07:59 -08:00
SamGondelman
9fc7813e24 Merge remote-tracking branch 'upstream/master' into v3 2018-12-20 16:05:06 -08:00
John Conklin II
69876bdec2
Merge pull request #14548 from SamGondelman/mirrorFix
Case 19473 (#2): Fix Mirror tonemapping
2018-12-07 16:11:59 -08:00
John Conklin II
0a80c16686
Merge pull request #14419 from SamGondelman/splash
Case 19740: Improve startup times by pre-compiling shaders with splash screen
2018-12-07 16:10:52 -08:00
SamGondelman
8431b3b0c1 correct order of mixes 2018-12-07 10:39:10 -08:00
Sam Gondelman
df6fbefc31
Merge branch 'master' into v3 2018-12-05 16:51:33 -08:00
SamGondelman
287878ff98 merge with master 2018-12-05 10:35:08 -08:00
SamGondelman
2acb6b6857 v3 procedurals and shader fixes 2018-11-28 17:58:27 -08:00
Sam Gondelman
4d621ba61c Merge branch 'master' into splash 2018-11-27 16:01:07 -08:00
SamGondelman
1f354f813c rework shader pre-compilation 2018-11-27 14:38:02 -08:00
SamGondelman
0fccb4c73c move to batch, try to use static 2018-11-17 01:45:16 -08:00
Sam Gondelman
968ffe7ec3
Merge branch 'master' into branching 2018-11-16 10:25:02 -08:00
Sam Gondelman
a206d9e25a
Merge branch 'master' into branching 2018-11-14 17:08:08 -08:00
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