mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
8538dcb1bc4df01dfc7d20ccca87db935fcfc509
11 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Josh Adams
|
cff34abe0d |
Copying //UE4/Dev-Platform to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden #rb none [CL 3020245 by Josh Adams in Main branch] |
||
|
Josh Adams
|
877a542dd6 |
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 2970079)
========================== MAJOR FEATURES + CHANGES ========================== Change 2945365 on 2016/04/15 by Mark.Satterthwaite Assert if anyone calls RHIClearUAV on a structured-buffer or texture under Metal - there's no clear way to implement these cases yet. Change 2945366 on 2016/04/15 by Mark.Satterthwaite Change the Metal parallel command-context submission to hand-off the entire NSArray of MTLCommandBuffers to avoid race conditions between one use of a context and the next. Change 2945394 on 2016/04/15 by Mark.Satterthwaite Duplicate CL #2943702 from 4.11.2: Change the way Metal validates the render-target state so that in FMetalContext::PrepareToDraw it can issue a last-ditch attempt to restore the render-targets. This won't fix the cause of the Mac Metal crashes but it might mitigate some of them and provide more information about why they are occurring. Change 2945444 on 2016/04/15 by Mark.Satterthwaite Cache the Metal fallback depth-stencil surface for the canvas tile rendering so that we only ever keep one spare depth-stencil surface around. This costs us a little more permanent memory but reduces churn. Change 2945457 on 2016/04/15 by Mark.Satterthwaite Add validation code to MetalRHI to ensure that we don't erroneously re-clear existing render contents when restoring the render command encoder. This will only be active when the Metal debug layer is enabled and is completely compiled away in Test & Shipping builds for performance. Change 2946249 on 2016/04/16 by Nick.Shin build HarfBuzz for HTML5 #jira UE-28552 - HarfBuzz - HTML5 Change 2946250 on 2016/04/16 by Nick.Shin Rename/move file(s) move emscripten (part 1 of 2) from Engine/Source/ThirdParty/HTML5/emsdk to Engine/Extras/ThirdPartyNotUE/emsdk this is a request from legal Change 2946251 on 2016/04/16 by Nick.Shin move emscripten (part 2 of 2) build scripts and cpp files updated with new emscripten path from Engine/Source/ThirdParty/HTML5/emsdk to Engine/Extras/ThirdPartyNotUE/emsdk this is a request from legal Change 2946516 on 2016/04/18 by Mark.Satterthwaite Disable r.DFShadowScatterTileCulling as well as r.AOScatterTileCulling on Mac because we don't have the necessary RW textures on Metal. Change 2947000 on 2016/04/18 by Michael.Trepka Print OS X version to log in FMacPlatformMisc::PlatformInit() Change 2948197 on 2016/04/19 by Lee.Clark PS4 - Use SDK 3.508.031 Change 2948301 on 2016/04/19 by Nick.Shin upgrading zlib openssl libcurl libwebsockets part 1 of 2 -- adding new compiled versions (part 2 will be removing the old version -- which will be done after platform owners are given a chance to recompile for their platform - most notably: zlib) NOTE: Linux libraries are built for CentOS 6.7 (i.e. 2010 - glibc 2.12 and gcc 4.4.7) #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1223 - Arrange testing for 'update websocket library' #jira UEPLAT-1203 - Add Linux library for libwebsockets #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2948319 on 2016/04/19 by Nick.Shin update zlib to v1.2.8 part 1 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library Change 2948320 on 2016/04/19 by Nick.Shin update OpenSSL to v1.0.1s part 2 of 4 - doing this in stages for tracking purposes also, removing dynamic libs (for windows) -- these are no longer needed as this is now statically linked in editor - tested by installing perforce server setup with ssl access only and pointing editor source code to it as ssl:hostname:port - also tested trying accessing it without ssl which resulted in access denied indicating a successful test of dynamic lib removal #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2948323 on 2016/04/19 by Nick.Shin build scripts pull source and compile - zlib openssl libcurl & libwebsockets tested on: - Win64 VS2013 & VS2015 - OSX - Linux #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1203 - Add Linux library for libwebsockets #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2948337 on 2016/04/19 by Lee.Clark VS 2015 libScePad support Change 2948382 on 2016/04/19 by Mark.Satterthwaite Add Mac model, CPU string, num HTs to the log on Mac so that errors reported to us contain the data that Apple want when we turn them into bug-reports. Also added a missing sigaction from the trampoline. Change 2948385 on 2016/04/19 by Mark.Satterthwaite Disambiguate Metal command-buffer failures by vendor & error type so that we don't end up with just one crash-reporting entry for many different kinds of crash and enable this assertion on all builds because it will always be fatal and failing to crash here may end up causing the Mac to reboot. Change 2948460 on 2016/04/19 by Peter.Sauerbrei fix for wrong line endings Change 2948526 on 2016/04/19 by Nick.Shin fix for wrong line endings Change 2949334 on 2016/04/20 by Nick.Shin fix library path for some reason, NetworkFileSystem and HttpNetworkReplayStreaming on Mac platform needs full path - even though lib path was set... Change 2949398 on 2016/04/20 by Lee.Clark PS4 - Fix SDK compile warnings Change 2949656 on 2016/04/20 by Nick.Shin Back out changelist 2948320 but keeping the C# build file as-is Change 2949676 on 2016/04/20 by Mark.Satterthwaite Double-buffer the Metal viewport's back-buffer so that we can access the contents of the back-buffer after EndDrawingViewport is called until BeginDrawingViewport is called again on this viewport, this makes it possible to capture movies on Metal. #jira UE-29140 Change 2950025 on 2016/04/20 by Mark.Satterthwaite Undo CL #2949676 and instead on Mac where we want to be able to capture videos of gameplay we just insert an intermediate texture as the back-buffer and use a manual blit to the drawable prior to present. This also changes the code to enforce that the back-buffer render-target should never be nil as the code & Metal API itself assumes that this situation cannot occur but it would appear from continued crashes inside PrepareToDraw that it actually can in the field. This will address another potential cause of UE-29006. #jira UE-29006 Change 2950084 on 2016/04/20 by Nick.Shin OSX warning fix: UE4 supports down to OSX 10.9 rebuilt the zlib openssl libcurl and libwebsockets to support that build file also updated to use MACOSX_DEVELOPMENT_TARGET=10.9 Change 2950613 on 2016/04/20 by Dmitry.Rekman UAT: Disable modules that are not supported on Linux. #rb none #codereview Ben.Marsh, Michael.Trepka, Josh.Adams #tests Run RunUAT.sh Change 2951065 on 2016/04/21 by Nick.Shin temp: update SSL dlls in Engine/Binaries/ThirdParty/OpenSSL/Win64 Change 2951556 on 2016/04/21 by Nick.Shin static libs double checked #jira UE-29674 - Editor fails to open in Dev-Platform Change 2951559 on 2016/04/21 by Nick.Shin static libs double checked forgot these files - they were in another changelist #jira UE-29674 - Editor fails to open in Dev-Platform Change 2951574 on 2016/04/21 by Nick.Shin remove unused variable warning was bughunt code... Change 2951652 on 2016/04/21 by Josh.Adams - Disabled MRT support on iPad Air 1 devices, since it doesn't support wide enough MRTs that the engine needs (ie, only use MRTs in METAL_MRT mode on iOS) Change 2951656 on 2016/04/21 by Josh.Adams - Fixed Mac compile error in Metal Change 2951718 on 2016/04/21 by Nick.Shin remove shared SSL DLLs in a controlled manner tested with QA help who was able to replicate the bug in the morning - and was able to successfully run the editor with this changelist (shelved - remote unshelved test - thanks Dan.Bullard_volt!) #jira UE-29674 - Editor fails to open in Dev-Platform Change 2951862 on 2016/04/21 by Lee.Clark PS4 - Enable Neo high resolution support. Change 2952409 on 2016/04/22 by Nick.Shin add win32 build targets for zlib openssl libcurl libwebsockets part 1 of 2: these are the libs and header files Change 2952411 on 2016/04/22 by Nick.Shin add win32 build targets for zlib openssl libcurl libwebsockets part 1 of 2: these are the C# build scripts Change 2952580 on 2016/04/22 by Lee.Clark PS4 - Fix staging and deploying of system prxs Change 2953152 on 2016/04/22 by Mark.Satterthwaite Only cache instances of TShadowDepthVS with bIsForGeometryShader=true when the RHI can handle the underlying feature. We can save memory on iOS by only emitting these shaders on Mac Metal or RHI's with Geometry shaders which have the required H/W to do this. Change 2953385 on 2016/04/22 by Nick.Shin use HarfBuzz libs for HTML5 c# build files updated to link in the harfbuzz libs #jira UE-28552 - HarfBuzz - HTML5 Change 2954686 on 2016/04/25 by Nick.Shin from legal: Emscripten approved for redistribution provided that *all* files are checked into the following directory: Engine/Extras/ThirdPartyNotUE Please also check in the attached .tps files and licenses alongside the TPS itself. This will allow us to track third party files within P4. Change 2954928 on 2016/04/25 by Daniel.Lamb Fixed min number of threads allocated for compiling shaders in cooker. Change 2954942 on 2016/04/25 by Daniel.Lamb Added flag -skipcompile for running visual studio. Skip force compilation on -multiprocess flag. #jira UE-22308 #PR 1678 #1678 Change 2954948 on 2016/04/25 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2955370 on 2016/04/25 by Josh.Adams - Fixing C# error from main #lockdown nick.penwarden Change 2957745 on 2016/04/27 by Daniel.Lamb Pull request from acordon@microsoft.com. Fixed deterministic cooking issue with StaticMeshComponent using StaticMesh before it had it's postload call. Change 2957747 on 2016/04/27 by Daniel.Lamb Pull request from acordon@microsoft.com. Resave packages commandlet now can also rebuild asset registry paths with consistent case. Change 2957750 on 2016/04/27 by Daniel.Lamb Pull request from acordon@microsoft.com. Fixed deterministic cooking issue with StaticMeshComponent using StaticMesh before it had it's postload call. Change 2958708 on 2016/04/28 by Nick.Shin remove boringSSL #jira UE-29970 - QAGame launch on fails for Win64, fatal error LNK1169: one or more multiply defined symbols found #lockdown josh.adams Change 2958724 on 2016/04/28 by Nick.Shin moved setting bVerifyPeer flag AFTER CertBundlePath has been set... otherwise, libCurl is going to try to verify the SSL session - but without a cert file, it makes no sense to try and verify the session - we could (and probably should) make this an error condition - but the constructor has the bVerifyPeer set to true -- which would mean that all games will need to have a cert file and/or know to set bVerifyPeer to false... - and so far, only linux and android seem to have code in place to make use of the cert files... #jira UE-29950 - Orion deticated server MCP authentication fails when using CURL #lockdown josh.adams Change |
||
|
Josh Adams
|
cf651e0c63 |
Change 2898947 on 2016/03/08 by Mark.Satterthwaite
Move the Apple Driver Monitor stats into their own stat groups, DriverMonitor has the common stats, DriverMonitorAMD/Intel/Nvidia have the vendor/GPU specific stats. The Metal and OpenGL RHIs update the driver monitor stats group for the current GPU at the appropriate time. Change 2898950 on 2016/03/08 by Mark.Satterthwaite More shader cache code documentation. Change 2898952 on 2016/03/08 by Michael.Trepka Check GPU driver version and warn of bad drivers only on Windows Change 2898964 on 2016/03/08 by Mark.Satterthwaite Only verify the vertex attribute layout for Metal in debug builds or when using development with the debug layer turned on. It reduces performance significantly and isn't all that helpful unless you are attempting to debug a mismatch. Change 2898973 on 2016/03/08 by Mark.Satterthwaite Switch uniform buffers to managed memory on Mac as this is more appropriate for AMD & Nvidia GPUs. Change 2898988 on 2016/03/08 by Mark.Satterthwaite Simplify MetalContext by having only one SubmitCommandsHint implementation. Change 2899011 on 2016/03/08 by Mark.Satterthwaite Duplicate 4.11 CL #2898988: Proper fix for UE-25804 - we have to manually expand PF_G8 + SRGB to RGBA8_sRGB - this then fixes UE-27483. #jira UE-25804 #jira UE-27483 Change 2899024 on 2016/03/08 by Mark.Satterthwaite Duplicate 4.11 CL #2887365 & CL #2887583: Allow InfiltratorDemoEditor under Metal to issue a query buffer reset without crashing - the function that switches to the new query buffer needs to reapply some of the draw-state so that future commands don't dereference nil. #jira UE-27513 My earlier fix for UE-27513 overlooked various internal details that meant it wouldn't restore state correctly, would fail validation and could crash in a new place. This version will ensure that cached state is only reset when it is appropriate to do so and will restore it correct when doing a query buffer reset. #jira UE-27513 Change 2899418 on 2016/03/08 by Daniel.Lamb Added support for textboxes in the editor to convert uasset filenames into long package names. As this is more useful to the cooker and more portable for projects. #codereview Matt.Kuhlenschmidt #jira UE-27785 Change 2899419 on 2016/03/08 by Daniel.Lamb Added support for passing -opengl command through to launch on if the editor is started with it. #codereview Michael.Trepka Change 2900846 on 2016/03/09 by Mark.Satterthwaite Reimplement Metal object lifetime tracking as stats in the stat-group, though the old system is maintained as a debug-only tool that could (and probably should) be extended to track over/under-release bugs. Currently the texture count will be distorted by texture SRVs so will need improvement but other stats should be reliable. In order to properly report the number of buffers the TResourcePool policy class must now define a FreeResource function, so I've added them to the appropriate places too. Change 2900853 on 2016/03/09 by Mark.Satterthwaite Optimise away empty encoders that don't perform a clear operation on AMD & Intel, but not Nvidia or non-Mac Metal devices. This should slightly improve performance. Change 2900927 on 2016/03/09 by Mark.Satterthwaite Implemented operation threshold submission of Metal command buffers to keep the GPU busier and not just idle waiting for the CPU. Whenever rhi.Metal.CommandBufferCommitThreshold is set to a value >0 and the current command buffer has >= draw/dispatch operations outstanding then the command-buffer will be committed at the next encoder boundary. The default value is 100 operations which is currently arbitrary and the feature can be disabled by setting the value to <= 0 in which case only explicit submissions will occur as previously. Change 2901310 on 2016/03/09 by Mark.Satterthwaite Change OneColor clear shader setup so that it works with parallel encoding in Metal. Change 2903002 on 2016/03/10 by Mark.Satterthwaite Instantiate the OneColor shaders once in Metal. Change 2903274 on 2016/03/10 by Mark.Satterthwaite Remove more unnecessary parallel execution stalls from MetalRHI. Change 2903402 on 2016/03/10 by Mark.Satterthwaite Implement Metal support for index buffer SRVs. Change 2903419 on 2016/03/10 by Mark.Satterthwaite Always use Managed memory on Mac Metal for buffers. Change 2905206 on 2016/03/11 by Mark.Satterthwaite Worked around UE-27818 "ElementalDemo Causes Invalid Rendering on AMD GPUs" - recent changes to allow mesh particles to write to velocity leave a texture-buffer unbound & then use a uniform value & an if-branch to guard against access but AMD's Mac GL driver notices that the buffer is referenced in the shader but not bound & promptly tries to fallback to Apple's S/W renderer regardless of what the uniform value is. That's legal behaviour for an OpenGL implementation so the C++ code has been changed to allocate and write the current transforms into the buffer for OpenGL when they wouldn't otherwise be provided. This is sufficient to avoid the problem without affecting any other API. Change 2906217 on 2016/03/11 by Nick.Shin re-enabled http network file server it was disabled in CL: #2790193 #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 2908203 on 2016/03/14 by Michael.Trepka Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform). Everything but SSF lib. Change 2908553 on 2016/03/14 by Mark.Satterthwaite Force a submit & wait in Metal when contexts are being destroyed to prevent kernel panics in drivers which continue to process the now abandoned command-queue and encounter invalid resources (because we destroy them on shutdown). Change 2908595 on 2016/03/14 by Michael.Trepka Fixed iOS compile error in MetalUniformBuffer.cpp #codereview Mark.Satterthwaite Change 2910106 on 2016/03/15 by Mark.Satterthwaite Use a dispatch_semaphore not an FEvent for Metal free-list synchronisation as the dispatch_worker threads can't be properly setup for FStats and this causes problems. Change 2910107 on 2016/03/15 by Mark.Satterthwaite Fix Metal reporting of GPU memory through the RHI as it is in bytes, not MB. Change 2910138 on 2016/03/15 by Mark.Satterthwaite Properly retain/release dispatch_semaphore for Metal command buffer completion block & allow uniform buffer creation on parallel encoding thread. Change 2911735 on 2016/03/16 by Nick.Shin housekeeping removing extra and inconsistant whitespace as well as making tabs & spaces consistant [CL 2936662 by Josh Adams in Main branch] |
||
Matthew Griffin
|
20be235fa6 |
Merging //UE4/Release-4.11 to //UE4/Main (Up to 2874930)
#lockdown Nick.Penwarden
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2868448 on 2016/02/16 by Mark.Satterthwaite
Bring MetalRHI & MetalShaderFormat mostly up to Dev-Platform CL #2867146 to address JIRA UE-26181 and as the first part of addressing JIRA UE-23208. Only CL #2854142 has been omitted for compatibility with the 4.11 branch.
#jira UE-26181
Change 2868454 on 2016/02/16 by Mark.Satterthwaite
Shader changes necessary to properly fix Mobile Preview under Mac Metal (JIRA UE-23208) - Mac ES 3.1 doesn't support framebuffer fetch & is in fact a Mobile Emulation shader platform.
#jira UE-23208
Change 2868650 on 2016/02/16 by Matthew.Griffin
Allow Developer modules to be pre-compiled when the target is editor.
#jira UE-26802
Change 2868859 on 2016/02/16 by Nick.Whiting
Merging StereoPanorama fixes from Main to Release-4.11 (CL 2811839)
#jira UE-25066
Change 2868927 on 2016/02/16 by Mieszko.Zielinski
Fixed some regular-use crashes in LogVisualizer #UE4
#rb Lukasz.Furman
#jira UE-27003
Change
|
||
James Moran
|
f9392202a7 |
Tweaking HTML5 package compression.
When packaged HTML5 can now handle being hosted on servers that don't support static compression - done by removing explicit requests for compressed files. Compression requires correct server setup. htaccess file included in package deploy to make this easier. Changed HTML5LaunchHelper to switch between compressed/uncompressed files when uncompressed files do/don't exist. [CL 2691701 by James Moran in Main branch] |
||
Ankit Khare
|
2c639a0f33 |
don't mix https with http in the template #html5
[CL 2611761 by Ankit Khare in Main branch] |
||
|
Ankit Khare
|
cb9851e8cc |
#html5 fix emitting compression for code projects. use consistent file extentions for compressed files.
[CL 2584749 by Ankit Khare in Main branch] |
||
|
Ankit Khare
|
d2ec18b95e |
UEPLAT-794 Emit compressed javascript from HTML5 packaging .
- big build products which are sent over the wire are now compressed. - modfied HTML5Launcher to serve compressed files. Added this to the final packaged game too because python simple http server does not handle compressed files. - combined various javascript utlity files into one. #codereview josh.adams, james.moran [CL 2577658 by Ankit Khare in Main branch] |
||
|
James Moran
|
aed05f725b |
Updated HTML5 templates to fix fullscreen issues across browsers.
#codereview ankit.khare [CL 2560487 by James Moran in Main branch] |
||
|
Ankit Khare
|
bd6ee8ccad |
UE-8662: unresponsive script warning when using development buids.
- don't include debuggin info / minify development builds - cuts development binary size from 200Mb to 69Mb. - generate symbols file - modify template to download this symbols file on the fly on a crash and use it generate an unmangled and unminified callstack. ( we now have real callstacks for shippign builds!) #codereview josh.adams , james.moran [CL 2556055 by Ankit Khare in Main branch] |
||
|
Ankit Khare
|
8a2d642116 |
HTML5: An alternate template with accurate progress bar/UI styling etc.
[CL 2521393 by Ankit Khare in Main branch] |