izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Copying //UE4/Dev-Console@10648120 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)

Browse Source 
#rb none
#rnx

[CL 10658496 by jeff newquist in Dev-RenderPlat-Staging branch]
This commit is contained in:
jeff newquist
2019-12-11 15:21:23 -05:00
parent 524dc1e897
commit 9fa00a0482
27 changed files with 157 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Engine/Build/Commit.gitdeps.xml
View File

@@ -35915,7 +35915,7 @@
<File Name="Engine/Extras/UnrealVS/VS2015/UnrealVS.vsix" Hash="a205314fe693d98d27c2fa27e212c0bc8f9d1ab9" />
<File Name="Engine/Extras/UnrealVS/VS2017/UnrealVS.vsix" Hash="4458cb6c87cb5d161bb8c2f88316b9bb04e7f84f" />
<File Name="Engine/Extras/UnrealVS/VS2019/UnrealVS.vsix" Hash="0262485bbd336c0a1f86a430d5a2f7b032e36b04" />
<File Name="Engine/Extras/VisualStudioDebugging/UE4.natvis" Hash="e43ec63ff4fcd126cddf091f19467131d7f6e392" />
<File Name="Engine/Extras/VisualStudioDebugging/UE4.natvis" Hash="07c1ac53318d9e95a4d59af68063f114bd60bc28" />
<File Name="Engine/Extras/VisualStudioDebugging/UE4_Android_Nsight.dat" Hash="6529564713f47b0a7dee6e03e776cd4c28887501" />
<File Name="Engine/Extras/VisualStudioDebugging/usertype.dat_ForHLSL" Hash="b504120990a654a5f6ce6dc5afc5a4b8c40525f0" />
<File Name="Engine/Platforms/XXX/Content/Launcher/Platform_XXX_128x.png" Hash="7d731a2fc86e154f6531cbacdd0a2dbd49b6c489" />
@@ -61315,6 +61315,7 @@
<Blob Hash="07b87547c202e633201d1fe583945df1ee452e88" Size="1459" PackHash="f1f7c9d958c098113ab1fca1fd2355ab72172280" PackOffset="28199" />
<Blob Hash="07be252d8712eb587df921e3df3fc3bc3fc2ce98" Size="5536" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="2081153" />
<Blob Hash="07be3535033ab35ab08c8a98151362937268fd0d" Size="265" PackHash="e458507f455e3bac9232d632426fc4b75f29841d" PackOffset="2078682" />
<Blob Hash="07c1ac53318d9e95a4d59af68063f114bd60bc28" Size="69489" PackHash="5a98e9e70e9f04a47cb5f6d51283b525957b7d2d" PackOffset="113957" />
<Blob Hash="07c2c76902bcf9a385ee2aa7096dd5eac223f7a3" Size="658659" PackHash="90bb16662a7f1d7523f971292bcd21edce001a3e" PackOffset="786496" />
<Blob Hash="07c445885dc9c12a36bdf7bac28b87063b7060f7" Size="4554" PackHash="f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" PackOffset="777885" />
<Blob Hash="07c5a6e3bd6e8f5dd008e86511af09f5acdf3ee6" Size="40162" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="2032295" />
@@ -67730,7 +67731,7 @@
<Blob Hash="300dba95b419c4d226703c8e53ba82760cc7f452" Size="29628" PackHash="f048ee5712bdc546a5ae30754de51176363dab5c" PackOffset="8" />
<Blob Hash="300e24e5bc4563a2e6e8cef7b6cfadc835f1e85c" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="568808" />
<Blob Hash="3010c8ed65d05c2b8d14ebba16373c299f2b92d8" Size="3543" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="892225" />
<Blob Hash="30117c6d0cb65bc39d4535362e9d342957da30be" Size="74861" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="332644" />
<Blob Hash="30117c6d0cb65bc39d4535362e9d342957da30be" Size="74861" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="310122" />
<Blob Hash="3012925e6b17f6475e04109d3abf8d34f32c439a" Size="738" PackHash="33500fd8a597fff43ada9ca1859308b07a1917ca" PackOffset="968313" />
<Blob Hash="30130c178d7ac53ed2f85aa38a70c2bc49a1819b" Size="57" PackHash="7bef3b4a940848d82dfd45a21576016bcc3de743" PackOffset="2097097" />
<Blob Hash="3013691819762d75746e4a99e9bc574472624562" Size="923" PackHash="182f5e85a6fa18a106bce1b1832dcaffe3be4777" PackOffset="1792179" />
@@ -67891,7 +67892,7 @@
<Blob Hash="310885283205511fd81aed72328c9c87b44b8b0c" Size="812" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="1480380" />
<Blob Hash="310885f4226180b2dc8f6d8f2d821d4f52e8e164" Size="1668" PackHash="03a57b683db3714c332944263de93ccc72e77351" PackOffset="2095112" />
<Blob Hash="3108d84c7fb6d25a9bfc3fefd7ce24932f308d8e" Size="5666" PackHash="2ec05cb49a7a2a040086664ee58480120ee8c9aa" PackOffset="2086332" />
<Blob Hash="310beb982da7dfbf9dc58efdeb0aef0fb1bf1b93" Size="106054" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="1795672" />
<Blob Hash="310beb982da7dfbf9dc58efdeb0aef0fb1bf1b93" Size="106054" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="1053722" />
<Blob Hash="310d0236dfb34f1effa5db2d58b9b160f4094945" Size="2588" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="1603981" />
<Blob Hash="311282470b76c3a4ea339c4e762fca53b309d111" Size="40" PackHash="2e3237f4ac211e07a6a21bd72eb72dcb0a8d87ed" PackOffset="2018652" />
<Blob Hash="3112f0b98d61000eac349ffefc58bc53b1df5807" Size="420" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1757996" />
@@ -72139,7 +72140,7 @@
<Blob Hash="4ada4e5461d060afe8ffdbab838b30ae2c0c2986" Size="143" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="958672" />
<Blob Hash="4adbf1d9c34e926b9e0a7af26a1405ede974d89f" Size="71852" PackHash="23ee57f97cf2c1f58e59a1daf368b5b8d59397fb" PackOffset="1898438" />
<Blob Hash="4adcbac1e9a9cec2fa3f12d9c597cf6754452c79" Size="959" PackHash="33500fd8a597fff43ada9ca1859308b07a1917ca" PackOffset="935035" />
<Blob Hash="4adf0643df76d1f38b0b8da21b90608653223afd" Size="3853" PackHash="5fef6b4e1f08ec3cf13b282ecf60528e9e2a1986" PackOffset="200507" />
<Blob Hash="4adf0643df76d1f38b0b8da21b90608653223afd" Size="3853" PackHash="5a98e9e70e9f04a47cb5f6d51283b525957b7d2d" PackOffset="200523" />
<Blob Hash="4ae0670568befbd647e94232a34215b86b855f4b" Size="216" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="2085608" />
<Blob Hash="4ae20c697025d9684cb22eb8a9d204987d3acc28" Size="306" PackHash="33500fd8a597fff43ada9ca1859308b07a1917ca" PackOffset="909791" />
<Blob Hash="4ae2be4fca3a8be0bce0c6671657ed129573ac12" Size="2901" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="340597" />
@@ -72265,7 +72266,7 @@
<Blob Hash="4b95884e7de1c68d50bb72746bfc4ea3e3f4e507" Size="431" PackHash="33500fd8a597fff43ada9ca1859308b07a1917ca" PackOffset="717174" />
<Blob Hash="4b96be0695818f7fee84ec68bcfa8e600f37075f" Size="2557548" PackHash="2b3b2c96ff480d025e1ac3dbec33f4edc62af5ae" PackOffset="8" />
<Blob Hash="4b96c9765bc3d7b48932eb1db6e19714425a86fd" Size="237384" PackHash="6258a9bfcbf698682c543611ad07181c28a5e2a8" PackOffset="1688872" />
<Blob Hash="4b978c75459e5fb39ce947ea564df29c1ef78865" Size="63046" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="152627" />
<Blob Hash="4b978c75459e5fb39ce947ea564df29c1ef78865" Size="63046" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="247076" />
<Blob Hash="4b9807679ff28e8b7489fb1ae1d9271a8472ec6c" Size="317" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1597814" />
<Blob Hash="4b9bec757e038b9beea3e59a837b7c38a4ab7f13" Size="28912" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1835635" />
<Blob Hash="4b9e9394feefafb2afdd5ccf6ec117efec2b5389" Size="257" PackHash="e60399ad3cfa431c2c38caaa8e92fc8b2e28da3b" PackOffset="651" />
@@ -75235,7 +75236,7 @@
<Blob Hash="5e8dce373fba9f04117cfdea9dea784bf140190a" Size="1703" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="149255" />
<Blob Hash="5e90514daaf5da9189343614af278ba62e870bad" Size="20253" PackHash="ef7cc18b93af8e98d5d8d2c2464bc0c8ebb4f78e" PackOffset="7441" />
<Blob Hash="5e95fa49dd495adeea132f7ceed8e01e8f11224c" Size="1212" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="265880" />
<Blob Hash="5e99626ea185fb9b0737652efa828d7990541925" Size="99954" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="1695718" />
<Blob Hash="5e99626ea185fb9b0737652efa828d7990541925" Size="99954" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="953768" />
<Blob Hash="5e9e280f0011b97f16bb31f74f6c8a99284d085c" Size="4055" PackHash="8212eaa7fe42912eebf1b3693978258b9118178d" PackOffset="13549" />
<Blob Hash="5ea170cf83447a85a9a41f3cb2440519eef503eb" Size="484" PackHash="3f2b20a4706ee519c8b369f4bc41b7c1af14c426" PackOffset="1237799" />
<Blob Hash="5ea3f290ecde1bab983ceee2417a688b7ed9b7f5" Size="21200" PackHash="a2710772cf46bb6041ccd01ef68d73bf51c3cdc6" PackOffset="2015760" />
@@ -76595,7 +76596,7 @@
<Blob Hash="673bacb31e34d6041e0bc6856242eace6a33db27" Size="11916" PackHash="01d26cddb178f064c3cd74a09430970bf6cc12b7" PackOffset="1093224" />
<Blob Hash="673e5f733444f72bb2fb90451234380623bbdc8e" Size="8012" PackHash="9fecacd969e95ff00f7f3a3049d3913a9458fd1e" PackOffset="981812" />
<Blob Hash="673f403e35f8fea9658322d2353fc6f0997d3532" Size="1464" PackHash="5b46cb88c4acfd4799bb3bf1f2542c9dff6c7064" PackOffset="220" />
<Blob Hash="67416964ae01bf8b340378de18866e1ed413260d" Size="90452" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="8" />
<Blob Hash="67416964ae01bf8b340378de18866e1ed413260d" Size="90452" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="94457" />
<Blob Hash="674175c52e150f56695209ce5747d47040898e33" Size="211325" PackHash="b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" PackOffset="1269402" />
<Blob Hash="67451382fd2551534a826b051b7e9f0b081383de" Size="123394" PackHash="4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" PackOffset="8" />
<Blob Hash="67453c5551167cfe16585e045e68b4e36d97cadb" Size="188203" PackHash="4022d82d143e72ccce04e7825d3328a7b02fc901" PackOffset="1613836" />
@@ -77372,7 +77373,7 @@
<Blob Hash="6c33eb6fa758741e0e53f766ce19e862ade54f78" Size="46548" PackHash="bb067df3cdf5af52d65795ed254038ab7bab212d" PackOffset="992590" />
<Blob Hash="6c33ec00eeb915e60b70457e2d92a57f6261593c" Size="13976" PackHash="8152e8edca61209c0ceddfe18df09424216095a3" PackOffset="1879848" />
<Blob Hash="6c37d8902c95cf8c5a2270634ddc5cd6a4c92c16" Size="19" PackHash="1a3a21e3a685f120e196700aaf9d7755a5ff8dee" PackOffset="1180478" />
<Blob Hash="6c38f0054e80028d46335abd58547fe564257e2b" Size="149875" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="407505" />
<Blob Hash="6c38f0054e80028d46335abd58547fe564257e2b" Size="149875" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="384983" />
<Blob Hash="6c398c5e96563a82d2903e2f758796190531e38e" Size="1837236" PackHash="235fb9da70c74afa6b41598b1f178262b96dd2b4" PackOffset="8" />
<Blob Hash="6c3be1b9e86bcdcaf8cbceb18fd915e40feddd5f" Size="108" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1623964" />
<Blob Hash="6c3f7ca9a034961cea28223bcb326e198fe27541" Size="1056" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="179059" />
@@ -78259,7 +78260,7 @@
<Blob Hash="71d04521b5aa01bb5f316c9b18738cf37fdb4ac5" Size="8119" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="1829962" />
<Blob Hash="71d3846aaaac829b4120279f8089fc023b7b1255" Size="3505" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1993748" />
<Blob Hash="71d421dfd89803148a2babe8481531024093a94d" Size="100" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="526160" />
<Blob Hash="71d49feb7dd27dbbe1e39d4148efa9f9726cface" Size="62167" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="90460" />
<Blob Hash="71d49feb7dd27dbbe1e39d4148efa9f9726cface" Size="62167" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="184909" />
<Blob Hash="71d6e1e95c1a9211a4b8fef2b99fe16cfdfa78b8" Size="108" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1617712" />
<Blob Hash="71d73ccb1e7cf79a7d1d502ff1f3a90ffa71c449" Size="168" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1894412" />
<Blob Hash="71d951b80b2be0c1676cfe64801e3c9811dcebb1" Size="281444" PackHash="54769dc019237bee8435c59514bad99a27554586" PackOffset="365053" />
@@ -80449,7 +80450,7 @@
<Blob Hash="7f2c1efbf7903f2c9fb6947dea545792c77a3e74" Size="2834" PackHash="bbd0d366aa5edcf7c89a18c6bcc1c936170ac171" PackOffset="1864547" />
<Blob Hash="7f2c82b26eb9ab9762e974f98a7793b474873136" Size="144" PackHash="d5bafdf3f50a35765f845dea41332e85db30f9ec" PackOffset="2096272" />
<Blob Hash="7f2d7ea4975afd5497ee8b4e30bd74f1fabc161b" Size="80" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="2096324" />
<Blob Hash="7f2f4d7b384b6c7c433079b7bfc44ca98444bbcf" Size="94449" PackHash="d0353c25c39c93f96aac00bcd036996f075a347f" PackOffset="78594" />
<Blob Hash="7f2f4d7b384b6c7c433079b7bfc44ca98444bbcf" Size="94449" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="8" />
<Blob Hash="7f3211e68e72bea07198aea40640410baa39a6d3" Size="2432" PackHash="f1f7c9d958c098113ab1fca1fd2355ab72172280" PackOffset="591050" />
<Blob Hash="7f322249e23c68efaa2b227cdf72563052437b0b" Size="2844" PackHash="cf2fb2bc86137b641c82b5a2a7d66f85e2cb6fe6" PackOffset="15443" />
<Blob Hash="7f36ed7d00f075e8fc1da8e84cea7c1dd20392d4" Size="45059" PackHash="c6ff0c8a2571289584ca0d23ec578b1aafc11f58" PackOffset="1371114" />
@@ -81523,7 +81524,7 @@
<Blob Hash="85fecc47e080e9b1320f0cff6cdd5bc112027b8b" Size="7991208" PackHash="5ba0ad5d563dae1128a8fd34ac3b605c4e57dba1" PackOffset="8" />
<Blob Hash="85ff3873095dbd93fb7c63b23a4a6d5956aef464" Size="92519" PackHash="020ced11c9100790d267fc18ffed7b634a589c32" PackOffset="23107" />
<Blob Hash="85ff93364cb50d7fbc17edeb4ceced181c94dfb3" Size="439" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="599399" />
<Blob Hash="8602751b1d3c19c02ce2d61729a8a7eda3f88da1" Size="17077" PackHash="5fef6b4e1f08ec3cf13b282ecf60528e9e2a1986" PackOffset="183430" />
<Blob Hash="8602751b1d3c19c02ce2d61729a8a7eda3f88da1" Size="17077" PackHash="5a98e9e70e9f04a47cb5f6d51283b525957b7d2d" PackOffset="183446" />
<Blob Hash="8602fd682696b5a4586d0d5cd9f17f67660b894b" Size="8121" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="1838081" />
<Blob Hash="860421d1e220ee4d86992d7fb983afc4f09b7bff" Size="63256" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1947777" />
<Blob Hash="86062c938918b822d5fcce2af25914255ed05a03" Size="100" PackHash="375fc7daadf4e7c57ed3fb499492997b710a6201" PackOffset="1727212" />
@@ -84466,7 +84467,7 @@
<Blob Hash="986db1775df1897e51dd437b61da8aab56f7c3cf" Size="391" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="834888" />
<Blob Hash="986fcc9c44ca9f8cd69b4cc6a5a19f3aba41590b" Size="651" PackHash="d67cb445f37637410f670b1d8682dcf22ced07ae" PackOffset="410249" />
<Blob Hash="9870954d479dc877ae7d15b5335b6d240b11b423" Size="711235" PackHash="dcf86de3522f553e7f3b99b020fbb5fdc9b04950" PackOffset="1163930" />
<Blob Hash="9872c20f21625af0e384f85d299f2cf1cf3ffe58" Size="78586" PackHash="d0353c25c39c93f96aac00bcd036996f075a347f" PackOffset="8" />
<Blob Hash="9872c20f21625af0e384f85d299f2cf1cf3ffe58" Size="78586" PackHash="2f4ae9fd8962617f429a41dcd7d89178bdc539ee" PackOffset="8" />
<Blob Hash="9875338471cd733ff226cd53d5f852110f1379f8" Size="1681" PackHash="80aba82ae1c5a511f4ec1924f8f568af0c128b27" PackOffset="370194" />
<Blob Hash="9878114c0ccb4bfeed5e0d3969deb43af453d14c" Size="878" PackHash="6052368b140ef09eef836a223997cdd9799c5f54" PackOffset="615074" />
<Blob Hash="987860c170f17027cfdae8cf6ff7cb0ad44ec6f8" Size="18026" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="1220492" />
@@ -87816,7 +87817,7 @@
<Blob Hash="ad83a0ce8d95375b8685ccbc1508467a04e963e3" Size="7376" PackHash="8152e8edca61209c0ceddfe18df09424216095a3" PackOffset="1246236" />
<Blob Hash="ad87d70c1c6107747365ace23888597ec088ee9b" Size="205" PackHash="c96e9cd94a86b222bed132142b65c1d90314445d" PackOffset="1510160" />
<Blob Hash="ad88d959f80336ec2591e7e43896e8cf289204ff" Size="309" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="1844177" />
<Blob Hash="ad8dcd58bde5325c9bdaec5116c6876d68ad5cac" Size="108794" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="1901726" />
<Blob Hash="ad8dcd58bde5325c9bdaec5116c6876d68ad5cac" Size="108794" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="1159776" />
<Blob Hash="ad8f1f19ddb2be1f46ab7df6117e1a4143a6847b" Size="762" PackHash="575f74dfa9bbf700cb7b7a9af0f84b38e9990298" PackOffset="988562" />
<Blob Hash="ad8f2e203b2daf69e8bb7e70641f42063c37f9d8" Size="368" PackHash="de2e42ad57386aaae5fdc67c8512ac9ea3798d6d" PackOffset="1108836" />
<Blob Hash="ad90bb2fdf132fdbeda69b99281697d97fc05007" Size="1580" PackHash="efe8670db02085c8e29e5d0a9ee30a96c485753b" PackOffset="1052173" />
@@ -90977,7 +90978,7 @@
<Blob Hash="c1fcd6681f61eeb6581920bf21bc83a5759f6bb9" Size="8393" PackHash="e9d13be8354fa13b118d7fcc261098eb85ff28ce" PackOffset="149948" />
<Blob Hash="c1fd2b23563b2746ff1813db52fa30d325914f47" Size="1280" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="71425" />
<Blob Hash="c1fe5984bd6cf8e73bbf1aa9363714201518b9ee" Size="80" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1615800" />
<Blob Hash="c1ffa88928164a35146029d6d79bd49dfc3d6875" Size="236839" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="1458879" />
<Blob Hash="c1ffa88928164a35146029d6d79bd49dfc3d6875" Size="236839" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="716929" />
<Blob Hash="c200c36d8a20aa1ffe8e2d5b29c6e4ac44ab6e7a" Size="346064" PackHash="765a6d5c9910e8670b31aed31d6ab760d2d0a702" PackOffset="817212" />
<Blob Hash="c2011931a0fe5c41fac08919ccee1362fff186b6" Size="2369" PackHash="f1f7c9d958c098113ab1fca1fd2355ab72172280" PackOffset="569583" />
<Blob Hash="c20198fba0c6f6f6d871fa6b8ab0b063b5669360" Size="1788" PackHash="f1f7c9d958c098113ab1fca1fd2355ab72172280" PackOffset="1223244" />
@@ -93645,7 +93646,7 @@
<Blob Hash="d259221407111d2b1fb838d345626ead62bcc2c7" Size="236" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1716808" />
<Blob Hash="d2597bda7a17efb8d8912ef275bb6acd8fd82ff6" Size="6658" PackHash="289a1b921105ce48ba09d95a245cd2daa77b05bb" PackOffset="1951510" />
<Blob Hash="d25a7225bd6f66bd0d626e538ab132d481cf69d3" Size="861" PackHash="165dd84e92205b44c324acdc0b7686b756e1916c" PackOffset="27947" />
<Blob Hash="d25b4fc01537271fde2747062450288fb9b91518" Size="182071" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="1276808" />
<Blob Hash="d25b4fc01537271fde2747062450288fb9b91518" Size="182071" PackHash="1508cd974164204b58f8a4c6a555c12f1377e0e4" PackOffset="534858" />
<Blob Hash="d25c61ca9a1f10f6813d9c3a8663c3f771cb60fd" Size="27056" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="905904" />
<Blob Hash="d25ca2961c85dc2b01a1110fc23cc9c6a44782d4" Size="100" PackHash="ec47a61c9e578fd55eb52d1035235a98b560b026" PackOffset="770028" />
<Blob Hash="d25dc2bc3813ae0761e9511a7f734d9bff178809" Size="613" PackHash="7ca0e1410f00142dc9791ff1fb493669e443f644" PackOffset="135751" />
@@ -96514,7 +96515,6 @@
<Blob Hash="e438b625d66ff31196fd0963acc83d745d8f9b23" Size="1461" PackHash="5aa0f41c0e3c4142ef473b5be9c093a00d5db23e" PackOffset="1803222" />
<Blob Hash="e43950abe079b57f4b78efe57065c62ef58349e6" Size="120396" PackHash="04b45a4b51aa8d4d009ea9d2d65f3e8339f94007" PackOffset="1392294" />
<Blob Hash="e43a3b54e8240027ef1f6ed96450cbe8230d8d8a" Size="104" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1647032" />
<Blob Hash="e43ec63ff4fcd126cddf091f19467131d7f6e392" Size="69473" PackHash="5fef6b4e1f08ec3cf13b282ecf60528e9e2a1986" PackOffset="113957" />
<Blob Hash="e4410cd5391e64077b9c20c07797e51a9a950ebb" Size="107152" PackHash="9bda8fd29066ada9c2463526e8a7fc1894e3a0af" PackOffset="164451" />
<Blob Hash="e44498ee8cc97e7663e6b9f02af4b128e4da4bcd" Size="54" PackHash="e9a09b093995c04d2acb7e3436c6e7c61725a33d" PackOffset="2096920" />
<Blob Hash="e444aaa578838e879c18a7163afeed28c65bf04b" Size="91356" PackHash="7e4e4ddcbf0c1eafc0a4c0c9cf30c248611b2598" PackOffset="689670" />
@@ -96771,7 +96771,7 @@
<Blob Hash="e5cffe4825c57db51aa767249f9fad5100114bba" Size="1404" PackHash="375fc7daadf4e7c57ed3fb499492997b710a6201" PackOffset="1648208" />
<Blob Hash="e5d14667298b8ee75f1ce4e820eb5d3db5660166" Size="36352" PackHash="ea87ba1734347938ee473c01efe91259a6bab04f" PackOffset="1167" />
<Blob Hash="e5d172193796f30bc524bdf9e65fec1719ec5910" Size="144" PackHash="a0f790e6b3f9ae34a2e2e24b45aca6292ffa3ae6" PackOffset="1634057" />
<Blob Hash="e5d489eee2214aaad822d513028f9e1514a86792" Size="719428" PackHash="5e0f654570367bfb22db0739916c98e5e95af442" PackOffset="557380" />
<Blob Hash="e5d489eee2214aaad822d513028f9e1514a86792" Size="719428" PackHash="2f4ae9fd8962617f429a41dcd7d89178bdc539ee" PackOffset="176266" />
<Blob Hash="e5d4f1694a92b30c1f3781b4b6143e2f64bff7d5" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="2092984" />
<Blob Hash="e5d60e7647d900ce6801cabf5c21bbd94abd6e5b" Size="39264" PackHash="556575f22ff09db4ac7f8bce709ad832e9addb0d" PackOffset="2034165" />
<Blob Hash="e5d8797438fda3d819a05b429836664f33519e27" Size="39076" PackHash="c3a4ce7861427e417e289e118620ba02ecec6995" PackOffset="776303" />
@@ -100563,7 +100563,7 @@
<Blob Hash="fddd0a67ae815d8142529ca18eec26882310ae11" Size="59591" PackHash="79089140e5202cefce11d8a2b34030d6624160d9" PackOffset="1904733" />
<Blob Hash="fdded7042d78d10e359a2c37d20adb9038485db2" Size="3036" PackHash="a2e68b226fd34cb1968e88858acc12de2cc5a720" PackOffset="1971639" />
<Blob Hash="fde23b91df3cab129ab34aabc5d1eabf60783294" Size="3196" PackHash="2498f527d456bd0380fdfc3b81922ef492985104" PackOffset="2089262" />
<Blob Hash="fde42dcad9dfc27c3e07a02e4f3b6f790c6fd959" Size="113949" PackHash="5fef6b4e1f08ec3cf13b282ecf60528e9e2a1986" PackOffset="8" />
<Blob Hash="fde42dcad9dfc27c3e07a02e4f3b6f790c6fd959" Size="113949" PackHash="5a98e9e70e9f04a47cb5f6d51283b525957b7d2d" PackOffset="8" />
<Blob Hash="fde47710acbc036dd14d1bdc2a413ada97d84b9d" Size="690" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1591799" />
<Blob Hash="fdee98ae41a92008b6ba5d38968f3840f7a29b7c" Size="2378640" PackHash="6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce" PackOffset="8" />
<Blob Hash="fdf0d61b96dfac7b5d5dd2ae008792a483705ee0" Size="3375" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="878493" />
@@ -101182,6 +101182,7 @@
<Pack Hash="14d6ea9a914f64de4114dc9c6c90831c99d5e105" Size="492552" CompressedSize="200835" RemotePath="UnrealEngine-8900881-f43d7373d89b430dbd6301c78c0380fd" />
<Pack Hash="14f955646473cffd47c2887928850ef447f735a8" Size="8618016" CompressedSize="3053742" RemotePath="UnrealEngine-6550419-5b15c7c1f0a44c4f83c440737d93b283" />
<Pack Hash="150319d01df8f93667044b0b83c45bbc01781b47" Size="154426" CompressedSize="145118" RemotePath="UnrealEngine-8572331-6b1c70f7ea094cd586b91b507444c216" />
<Pack Hash="1508cd974164204b58f8a4c6a555c12f1377e0e4" Size="1268570" CompressedSize="964604" RemotePath="UnrealEngine-10646884-123c369310814280bfca7f1cc6eb4f8d" />
<Pack Hash="15290d2adfdd52e1d752e3b1a1275aa26fe56653" Size="7010396" CompressedSize="1692047" RemotePath="2945995-7123fe3174c344f6b24da7209d566cb8" />
<Pack Hash="1529bc16133aa9a3cd7bbf03e7707174299d16bc" Size="43307564" CompressedSize="7141507" RemotePath="UnrealEngine-8631716-9e1a99fae4f74045829b5460923df3ff" />
<Pack Hash="153658f76b91ed8823b46db2c2b8a3f457e2b0dd" Size="119573624" CompressedSize="32202410" RemotePath="UnrealEngine-6550419-5b15c7c1f0a44c4f83c440737d93b283" />
@@ -101542,6 +101543,7 @@
<Pack Hash="2f1833456d5750b5896fe6661c307634ccc78209" Size="10029192" CompressedSize="9956471" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
<Pack Hash="2f1e16d69c04d48e5d3b7814e5f8b28bc409e1ce" Size="1617118" CompressedSize="490923" RemotePath="UnrealEngine-6960242-9676469577454cfb88111175cb9c2bf5" />
<Pack Hash="2f458f468bf52f9dc65968e2a78ad4335c874306" Size="1579336" CompressedSize="538250" RemotePath="UnrealEngine-7235151-e146c7734bc34f90b913cd9df5ae476f" />
<Pack Hash="2f4ae9fd8962617f429a41dcd7d89178bdc539ee" Size="895694" CompressedSize="512222" RemotePath="UnrealEngine-10646681-0a041087c009457f9000f6640f5c5deb" />
<Pack Hash="2f5e43542d4bb00d43e08c62a7ca2ac021bae760" Size="129274" CompressedSize="26922" RemotePath="UnrealEngine-9958848-164ed9117e6f44cdbd1dbf3afb30ba04" />
<Pack Hash="2f778d711060aef5876bdfc867b9e1788334e0e9" Size="2439928" CompressedSize="950781" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
<Pack Hash="2f7ae7bc638641d3099e8c1f95b1d86bb8e3875e" Size="2097032" CompressedSize="566045" RemotePath="UnrealEngine-4784913-527cfd96b8c0432389bb7e5cc58ba600" />
@@ -102148,6 +102150,7 @@
<Pack Hash="5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" Size="2067243" CompressedSize="2043257" RemotePath="2372940-e2185854aff3439f82782883f74d5bf8" />
<Pack Hash="5a5976412f046d7221f3f17480cc2c863e6f4b3f" Size="2338608" CompressedSize="292184" RemotePath="UnrealEngine-3794679-5fe680a9ecfe428591bb2b3f47f3ed58" />
<Pack Hash="5a9512c3b6ef93903e2ea21a3dc69c53d24815c0" Size="5274896" CompressedSize="4895918" RemotePath="UnrealEngine-3512933-b8c77e7698834899a8e99121bf377ee8" />
<Pack Hash="5a98e9e70e9f04a47cb5f6d51283b525957b7d2d" Size="204376" CompressedSize="131905" RemotePath="UnrealEngine-10658496-27418c4952d94f618e6f1e56eb011375" />
<Pack Hash="5aa0f41c0e3c4142ef473b5be9c093a00d5db23e" Size="1804683" CompressedSize="486917" RemotePath="UnrealEngine-9420574-738cb264e193473ba730e0cfc0a3e1bd" />
<Pack Hash="5aa16a678ff65d943e46faa27a3f4e1c7606b4a8" Size="33111600" CompressedSize="10832891" RemotePath="UnrealEngine-10145308-2419d8f8b60942de841d582c6a8065de" />
<Pack Hash="5ab4d4088ea0b1d2d5a9b4b666d161a4a6b0486b" Size="4763484" CompressedSize="4762395" RemotePath="UnrealEngine-9736795-5e207c510f79487c895056fde58c4f8e" />
@@ -102211,7 +102214,6 @@
<Pack Hash="5dea9b6fce25b6e705cabdf75c5c60c4a0eedf0c" Size="2560186" CompressedSize="506061" RemotePath="UnrealEngine-3499771-59ec5d77513c4fec8b8c2d223f471956" />
<Pack Hash="5df5da7d7fc7fa9b84f4a437e43674d071f4d395" Size="27631" CompressedSize="5949" RemotePath="UnrealEngine-5236230-c629a4df88cc45a596df820aaf1244cd" />
<Pack Hash="5e0a2c3c2b7cc2dfe59ea645e0fc9c35aabaffeb" Size="3275032" CompressedSize="457618" RemotePath="UnrealEngine-5289317-00b95c2a4045419aad6209d30375bcf5" />
<Pack Hash="5e0f654570367bfb22db0739916c98e5e95af442" Size="2010520" CompressedSize="1286785" RemotePath="UnrealEngine-10464208-9ab633bedddb46d69c5956b86c626880" />
<Pack Hash="5e1df6424e03b1e193eda8d57976f54789d3335e" Size="1011228" CompressedSize="412424" RemotePath="UnrealEngine-5932461-3ea253b3b3c9462b902e0d5e7c662051" />
<Pack Hash="5e23b0c7fb17dd0116bb0d2fe936bd8be853c21e" Size="5168440" CompressedSize="344621" RemotePath="UnrealEngine-5478274-0d5a02708fc74725a962de6de34be276" />
<Pack Hash="5e26766915ec0d121d09e8bc9845432acbefd052" Size="8545744" CompressedSize="5681052" RemotePath="UnrealEngine-5008171-9669fc2c2a15458b8021f9b1a4ee0474" />
@@ -102243,7 +102245,6 @@
<Pack Hash="5faf008e5362918a43432a0224e3855a1b16e7e2" Size="16084764" CompressedSize="2230870" RemotePath="UnrealEngine-10607223-a121bd7962024613adc7bec5a2210ffe" />
<Pack Hash="5fba268c1ecdf6131af07cc77f318ee20a038de7" Size="23546010" CompressedSize="5137158" RemotePath="UnrealEngine-10145308-2419d8f8b60942de841d582c6a8065de" />
<Pack Hash="5fca1114c7a614eb900b286d0f28dffa9b37a554" Size="2097115" CompressedSize="398350" RemotePath="UnrealEngine-7319411-858f05a05ed14057b3c3272843308b0a" />
<Pack Hash="5fef6b4e1f08ec3cf13b282ecf60528e9e2a1986" Size="204360" CompressedSize="131904" RemotePath="UnrealEngine-10511569-ad592d36c8854fdcb7b92b51a59443db" />
<Pack Hash="5ff2c6f8991046f67276493ca8453be1dfe3bc09" Size="9548206" CompressedSize="833306" RemotePath="UnrealEngine-10607223-a121bd7962024613adc7bec5a2210ffe" />
<Pack Hash="5ff5f28a34e70da255a1902cdc6cdabf747b1cb1" Size="1988887" CompressedSize="893497" RemotePath="UnrealEngine-4240183-d373d3badd7e43e098cb363e8f25d92d" />
<Pack Hash="60079f44b8b7b6c3f432fb78bff5b16074a33000" Size="1181782" CompressedSize="758522" RemotePath="UnrealEngine-9093792-9219133484244f44a5658489d357237b" />
@@ -103790,7 +103791,6 @@
<Pack Hash="d0083f649df3b6e7af0cd3b4af0f871a8c8e26fc" Size="1987874" CompressedSize="530693" RemotePath="UnrealEngine-9898247-c2c7d3da59ad45f0bed29945ec0e1306" />
<Pack Hash="d0268d008742c0204b4653ea12cdb6a44b8c3b3a" Size="1378200" CompressedSize="492425" RemotePath="UnrealEngine-9898247-c2c7d3da59ad45f0bed29945ec0e1306" />
<Pack Hash="d02cd01745ba4739de2e992742999c6c11f72f0a" Size="5130822" CompressedSize="1008571" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
<Pack Hash="d0353c25c39c93f96aac00bcd036996f075a347f" Size="173043" CompressedSize="150881" RemotePath="UnrealEngine-9118698-e7d9edd24f9c4601a92a1475280d240c" />
<Pack Hash="d03eb4fb75b22f30563a9b7c1234bf8af070cfcc" Size="32291812" CompressedSize="8713761" RemotePath="UnrealEngine-7235317-31f4c36cc2b441639301544622f99bc8" />
<Pack Hash="d04835f28ba12e71231757843e5a326b57f38333" Size="3173462" CompressedSize="1746669" RemotePath="UnrealEngine-4091939-c95458e0d3984589aff80f0c0a07c163" />
<Pack Hash="d04b28db1c420111b67eb84104fa03aeacc7c186" Size="2092552" CompressedSize="622087" RemotePath="UnrealEngine-4693323-f6fbf7dd66304b179cff1537c7e40f52" />

28
Engine/Build/SNDBSTemplates/clang++.exe.sn-dbs-tool.ini Normal file
View File

@@ -0,0 +1,28 @@
[tool]
family=clang-cl
include_path01=..\include
include_path02=..\include\c++\v1
include_path03=..\lib\clang\*\include
[files]
main=clang++.exe
file01=clang-shared.dll
file02=libclang.dll
file03=NXMangledNamePrinter.dll
file04=..\lib\*
[output-file-patterns]
outputfile01=\s*"([^ ",]+\.cpp\.txt)\"
[output-file-rules]
rule01=*.log|discard=true
rule02=*.dat|discard=true
rule03=*.tmp|discard=true
[system-file-filters]
filter01=msvcr*.dll
filter02=msvcp*.dll
filter03=vcruntime140*.dll
filter04=appcrt140*.dll
filter05=desktopcrt140*.dll
filter06=concrt140*.dll

2
Engine/Plugins/Media/PixelStreaming/Source/PixelStreaming/Private/InputDevice.cpp
View File

@@ -36,8 +36,6 @@ class FCursor : public ICursor
public:
FCursor() {}
virtual ~FCursor() = default;
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override { return nullptr; }
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override { return nullptr; }
virtual FVector2D GetPosition() const override { return Position; }
virtual void SetPosition(const int32 X, const int32 Y) override { Position = FVector2D(X, Y); };
virtual void SetType(const EMouseCursor::Type InNewCursor) override {};

10
Engine/Source/Developer/AutomationDriver/Private/AutomatedApplication.cpp
View File

@@ -13,16 +13,6 @@ public:
virtual ~FAutomatedCursor()
{ }
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override
{
return nullptr;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override
{
return nullptr;
}
virtual FVector2D GetPosition() const override
{
if (bAllowMessageHandling)

2
Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
View File

@@ -3481,6 +3481,8 @@ public partial class Project : CommandUtils
// clean the staging directories first
foreach (var SC in DeployContextList)
{
SC.StageTargetPlatform.PreStage(Params, SC);
// write out the commandline file now so it can go into the manifest
WriteStageCommandline(Params, SC);
CreateStagingManifest(Params, SC);

17
Engine/Source/Programs/UnrealBuildTool/Executors/SNDBS.cs
View File

@@ -237,13 +237,15 @@ namespace UnrealBuildTool
{
// Create a dummy force-included file which references PCH files, so that SN-DBS knows they are dependencies.
string AdditionalStubIncludes = "";
if (Action.CommandPath.GetFileName().Equals("cl.exe", StringComparison.OrdinalIgnoreCase))
if (Action.CommandPath.GetFileName().Equals("cl.exe", StringComparison.OrdinalIgnoreCase) || Action.CommandPath.GetFileName().Equals("cl-filter.exe", StringComparison.OrdinalIgnoreCase))
{
string ResponseFile = Action.CommandArguments.Replace("\"", "").Replace("@", "").Trim();
string DummyPCHIncludeFile = Action.DependencyListFile.AbsolutePath.Replace("\"", "").Replace("@", "").Trim();
DummyPCHIncludeFile = Path.ChangeExtension(DummyPCHIncludeFile, null);
StringBuilder WrapperContents = new StringBuilder();
using (StringWriter Writer = new StringWriter(WrapperContents))
{
Writer.WriteLine("// PCH dependencies for {0}", ResponseFile);
Writer.WriteLine("// PCH dependencies for {0}", DummyPCHIncludeFile);
Writer.WriteLine("#if 0");
foreach (FileItem Preqrequisite in Action.PrerequisiteItems)
{
@@ -255,8 +257,8 @@ namespace UnrealBuildTool
Writer.WriteLine("#endif");
}
FileItem DummyResponseFileDependency = FileItem.CreateIntermediateTextFile(new FileReference(ResponseFile + ".dummy.h"), WrapperContents.ToString());
AdditionalStubIncludes = string.Format("/FI\"{0}\"", DummyResponseFileDependency);
FileItem DummyPCHIncludeFileDependency = FileItem.CreateIntermediateTextFile(new FileReference(DummyPCHIncludeFile + ".dummy.h"), WrapperContents.ToString());
AdditionalStubIncludes = string.Format("/FI\"{0}\"", DummyPCHIncludeFileDependency);
}
// Add to script for execution by SN-DBS
@@ -536,6 +538,11 @@ namespace UnrealBuildTool
IEnumerable<string> PlatformExpansions = PlatformNames.Select(p => String.Format("$1/{0}/{0}$2|$1/{0}$2", p));
IncludeRewriteRulesText.Add(String.Format("expansions2={0}", String.Join("|", PlatformExpansions)));
}
{
IncludeRewriteRulesText.Add(@"pattern3=ULANG_STRINGIFY\(\s*(\S*)ULANG_PLATFORM/ULANG_PLATFORM(\S*)\s*\)");
IEnumerable<string> PlatformExpansions = PlatformNames.Select(p => String.Format("$1{0}/{0}$2", p));
IncludeRewriteRulesText.Add(String.Format("expansions3={0}", String.Join("|", PlatformExpansions)));
}
File.WriteAllText(IncludeRewriteRulesFile.FullName, String.Join(Environment.NewLine, IncludeRewriteRulesText));
}
}

5
Engine/Source/Programs/UnrealBuildTool/Platform/Windows/VCToolChain.cs
View File

@@ -1292,7 +1292,8 @@ namespace UnrealBuildTool
// Resource tool can run remotely if possible
CompileAction.bCanExecuteRemotely = true;
CompileAction.bCanExecuteRemotelyWithSNDBS = false; // no tool template for SN-DBS results in warnings
List<string> Arguments = new List<string>();
// Suppress header spew
@@ -1333,7 +1334,7 @@ namespace UnrealBuildTool
}
}
// Figure the icon to use. We can only use a custom icon when compiling to a project-specific intemediate directory (and not for the shared editor executable, for example).
// Figure the icon to use. We can only use a custom icon when compiling to a project-specific intermediate directory (and not for the shared editor executable, for example).
FileReference IconFile;
if(Target.ProjectFile != null && !CompileEnvironment.bUseSharedBuildEnvironment)
{

6
Engine/Source/Programs/UnrealBuildTool/System/Action.cs
View File

@@ -168,6 +168,12 @@ namespace UnrealBuildTool
public Action(ActionType InActionType)
{
ActionType = InActionType;
// link actions are going to run locally on SN-DBS so don't try to distribute them as that generates warnings for missing tool templates
if ( ActionType == ActionType.Link )
{
bCanExecuteRemotelyWithSNDBS = false;
}
}
public Action(BinaryArchiveReader Reader)

5
Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxCursor.cpp
View File

@@ -172,11 +172,6 @@ FLinuxCursor::~FLinuxCursor()
}
}
void* FLinuxCursor::CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot)
{
return nullptr;
}
void* FLinuxCursor::CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot)
{
uint32 Rmask = 0x000000ff;

10
Engine/Source/Runtime/ApplicationCore/Public/Android/AndroidCursor.h
View File

@@ -15,16 +15,6 @@ public:
{
}
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override
{
return nullptr;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override
{
return nullptr;
}
virtual FVector2D GetPosition() const override
{
return CurrentPosition;

10
Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/GenericPlatformSoftwareCursor.h
View File

@@ -18,16 +18,6 @@ public:
{
}
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override
{
return nullptr;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override
{
return nullptr;
}
virtual FVector2D GetPosition() const override
{
return CurrentPosition;

9
Engine/Source/Runtime/ApplicationCore/Public/GenericPlatform/ICursor.h
View File

@@ -69,11 +69,14 @@ namespace EMouseCursor
class ICursor
{
public:
/** Creates a hardware cursor from file. Can return nullptr when not availbale. */
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) = 0;
/** Creates a hardware cursor from file. Can return nullptr when not available. */
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) { return nullptr; }
/** Is CreateCursorFromRGBABuffer() supported by this cursor? */
virtual bool IsCreateCursorFromRGBABufferSupported() const { return false; }
/** Creates a hardware cursor from bitmap data. Can return nullptr when not available. */
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) = 0;
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) { return nullptr; }
/** The position of the cursor */
virtual FVector2D GetPosition() const = 0;

11
Engine/Source/Runtime/ApplicationCore/Public/HoloLens/HoloLensCursor.h
View File

@@ -58,17 +58,6 @@ public:
*/
void SetTypeShape(EMouseCursor::Type InCursorType, void* CursorHandle);
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override
{
return nullptr;
}
/** Creates a hardware cursor from bitmap data. Can return nullptr when not available. */
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override
{
return nullptr;
}
private:
void SetUseRawMouse(bool bUse);

10
Engine/Source/Runtime/ApplicationCore/Public/IOS/IOSCursor.h
View File

@@ -15,16 +15,6 @@ public:
{
}
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override
{
return nullptr;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override
{
return nullptr;
}
virtual FVector2D GetPosition() const override
{
return CurrentPosition;

5
Engine/Source/Runtime/ApplicationCore/Public/Linux/LinuxCursor.h
View File

@@ -16,7 +16,10 @@ public:
virtual ~FLinuxCursor();
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override;
virtual bool IsCreateCursorFromRGBABufferSupported() const override
{
return true;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override;

2
Engine/Source/Runtime/ApplicationCore/Public/Mac/MacCursor.h
View File

@@ -17,6 +17,8 @@ public:
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override;
virtual bool IsCreateCursorFromRGBABufferSupported() const override { return true; }
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override;
virtual FVector2D GetPosition() const override;

5
Engine/Source/Runtime/ApplicationCore/Public/Windows/WindowsCursor.h
View File

@@ -16,6 +16,11 @@ public:
virtual void* CreateCursorFromFile(const FString& InPathToCursorWithoutExtension, FVector2D HotSpot) override;
virtual bool IsCreateCursorFromRGBABufferSupported() const override
{
return true;
}
virtual void* CreateCursorFromRGBABuffer(const FColor* Pixels, int32 Width, int32 Height, FVector2D InHotSpot) override;
virtual FVector2D GetPosition() const override;

16
Engine/Source/Runtime/ClothingSystemRuntimeNv/Private/ClothingSimulationNv.cpp
View File

@@ -1155,9 +1155,23 @@ void FClothingSimulationNv::UpdateLod(int32 InPredictedLod, const FTransform& Co
bool bOldLodMapped = LodMap.IsValidIndex(CurrentMeshLodIndex) && LodMap[CurrentMeshLodIndex] != INDEX_NONE;
// Get the clothing LOD mapped from the mesh predicted LOD
const int32 PredictedClothingLod = LodMap[InPredictedLod];
const int32 OldClothingLod = bOldLodMapped ? LodMap[CurrentMeshLodIndex] : INDEX_NONE;
// If potentialLod doesn't map to a valid LOD, we try higher LOD levels for a valid LOD.
// Asset might only have lod on LOD 1 and not 0, however if mesh doesn't force LOD to 1,
// asset will not be assigned valid LOD index and will not generate sim data, breaking things.
int32 PredictedClothingLod = INDEX_NONE;
for (int32 PotentialLod = InPredictedLod; PotentialLod < LodMap.Num(); ++PotentialLod)
{
if (LodMap[PotentialLod] != INDEX_NONE)
{
PredictedClothingLod = LodMap[PotentialLod];
break;
}
}
if(PredictedClothingLod == Actor.CurrentLodIndex)
{
// We must have forced a LOD update because we added a new actor - this actor is good to go though.

5
Engine/Source/Runtime/Engine/Private/GameViewportClient.cpp
View File

@@ -3817,6 +3817,11 @@ bool UGameViewportClient::GetUseMouseForTouch() const
void* UGameViewportClient::LoadCursorFromPngs(ICursor& PlatformCursor, const FString& InPathToCursorWithoutExtension, FVector2D InHotSpot)
{
if (!PlatformCursor.IsCreateCursorFromRGBABufferSupported())
{
return nullptr;
}
TArray<TSharedPtr<FPngFileData>> CursorPngFiles;
if (!LoadAvailableCursorPngs(CursorPngFiles, InPathToCursorWithoutExtension))
{

16
Engine/Source/Runtime/Engine/Private/PrecomputedVolumetricLightmap.cpp
View File

@@ -538,6 +538,8 @@ ENGINE_API void FPrecomputedVolumetricLightmapData::AddToSceneData(FPrecomputedV
// Steal the indirection texture. When the sublevels are unloaded the values will be restored.
IndirectionTexture = SceneData->IndirectionTexture;
}
RHICmdList.TransitionResource(EResourceTransitionAccess::EReadable, IndirectionTexture.Texture);
}
else
{
@@ -1057,6 +1059,20 @@ void FVolumetricLightmapBrickAtlas::Insert(int32 Index, FPrecomputedVolumetricLi
// Replace with new allcations
Allocations = NewAllocations;
TextureSet = NewTextureSet; // <-- Old texture references are released here
FRHITexture* Textures[3 + UE_ARRAY_COUNT(TextureSet.SHCoefficients)] =
{
TextureSet.AmbientVector.Texture,
TextureSet.SkyBentNormal.Texture,
TextureSet.DirectionalLightShadowing.Texture
};
for (int32 TextureIndex = 0; TextureIndex < UE_ARRAY_COUNT(TextureSet.SHCoefficients); ++TextureIndex)
{
Textures[TextureIndex + 3] = TextureSet.SHCoefficients[TextureIndex].Texture;
}
RHICmdList.TransitionResources(EResourceTransitionAccess::EReadable, Textures, UE_ARRAY_COUNT(Textures));
}
void FVolumetricLightmapBrickAtlas::Remove(FPrecomputedVolumetricLightmapData* Data)

Some files were not shown because too many files have changed in this diff Show More