Commit Graph

77 Commits

Author SHA1 Message Date
Matthew Griffin
f180dff107 Copying //UE4/Release-Staging-4.12 to //UE4/Dev-Main
#lockdown Nick.Penwarden

(Will update with full description tomorrow)

[CL 2984534 by Matthew Griffin in Main branch]
2016-05-19 19:35:35 -04:00
Matthew Griffin
984342ca17 Merging //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) post CL#2804086 to CL#2817167
CL#2805395 resolved as target to avoid copying 2015 changes
#lockdown Nick.Penwarden

[CL 2819197 by Matthew Griffin in Main branch]
2016-01-07 11:21:22 -05:00
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Josh Adams
660ab7f0c9 Copying //UE4/Dev-Platform to //UE4/Main
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2719147 on 2015/10/07 by Mark.Satterthwaite

	Allow the shader cache to perform some precompilation synchronously on load before falling back to asynchronous compilation to balance load times against total time spent precompiling. Added a stat to the group that reports how long the precompile has been running until it completes so it is easier to track.

Change 2719182 on 2015/10/07 by Mark.Satterthwaite

	Refactor the ShaderCache's internal data structures and change the way we handle recording whether a particular predraw state has been submitted to try and make it more efficient.

Change 2719185 on 2015/10/07 by Mark.Satterthwaite

	Merging CL #2717701: Try and fix random crashes on Mac when manipulating bound-shader-states caused by ShaderCache potentially providing a bogus shader state pointer on exit from predraw.

Change 2719434 on 2015/10/07 by Mark.Satterthwaite

	Make sure that Mac ensures reports have a source context and a sane callstack when sent to the crash-reports server.

Change 2724764 on 2015/10/12 by Josh.Adams

	[Initial AppleTV support]
	Merging	//depot/YakBranch/... to //UE4/Dev-Platform/...

Change 2726266 on 2015/10/13 by Lee.Clark

	PS4 - Calc reserve size required for DMA copy when using unsafe command buffers

Change 2726401 on 2015/10/13 by Mark.Satterthwaite

	Merging CL #2716418: Fix UE-15228 'Crash Report Client doesn't restart into project editor on Mac' by reporting the original command line supplied by LaunchMac, not the modified one that strips the project name. The CRC can then relaunch as expected.
	#jira UE-15228

Change 2726421 on 2015/10/13 by Lee.Clark

	PS4 - Don't try to clear invalid targets

Change 2727040 on 2015/10/13 by Michael.Trepka

	Merging CL 2724777 - Fixed splash screen rendering for images with DPI different than 72

Change 2729783 on 2015/10/15 by Keith.Judge

	Fix huge memory leak in Test/Shipping configurations, caused because I am a numpty.

Change 2729847 on 2015/10/15 by Mark.Satterthwaite

	Merging CL #2729846: On OS X unconstrain windows from the dimension of the parent display when in Windowed mode - it is OK for them to be larger in this case. They do need to be repositioned if on the Primary display so that they don't creep under the menu bar and become unmovable/unclosable and Fullscreen windows still need to be constrained to a single display. We can now take screenshots of windows that are larger than the display & not get grey bars beyond the cutoff.
	#jira UE-21992

Change 2729865 on 2015/10/15 by Keith.Judge

	Fast semantics - Finish up resource transitions, adding resource decompression where appropriate and using non-fast clears where we can't determine the resource transition.

Change 2729897 on 2015/10/15 by Keith.Judge

	Fast Semantics - Make sure all GetData() calls are made safe with GPU fences.

Change 2729972 on 2015/10/15 by Keith.Judge

	Removed the last vestiges of ID3D11DeviceContext/ID3D11DeviceContext1 from the Xbox RHI. Everything now uses ID3D11DeviceContextX directly.

	This should be marginally quicker as it stops a double call to ClearState().

Change 2731503 on 2015/10/16 by Keith.Judge

	Added _XDK_VERSION to the DDC key for textures, which should solve the issue of the tiling mode changing in August XDK (and future changes Microsoft may inflict).

Change 2731596 on 2015/10/16 by Keith.Judge

	Fast Semantics - Add deferred resource deletion queue to make deleted resources be actually deleted a number of frames later so that the GPU is definitely finished with them. Hooked up the temporary SRVs for dynamic VBs as a first step.

Change 2731928 on 2015/10/16 by Michael.Trepka

	PR #1659: Mac/Build.sh handles additional arguments (Contributed by judgeaxl)

Change 2731934 on 2015/10/16 by Michael.Trepka

	PR #1618: added clang 3.7.0 -Wshift-negative-value ignore in JpegImageWrapper.cpp (Contributed by bsekura)

Change 2732018 on 2015/10/16 by Mark.Satterthwaite

	Emit a shader code cache for each platforms requested shader formats, this is separate to the targeted formats as not all can or need to be cached.
	- The implementation extends the ShaderCache's hooks in FShaderResource's serialisation function to capture the required shaders.
	- Each target platform has its own list of cached shader formats, analogous to the list of targeted RHIs. Presently only the Mac implements this.
	- Code cached shaders are now compressed (for size) to reduce the overhead associated with keeping all the shader code around - this works esp. well for text-based formats like GLSL.

Change 2732365 on 2015/10/16 by Josh.Adams

	- Packaging a TVOS .ipa now works (still haven't tried any of the Editor integration like Launch On)

Change 2733170 on 2015/10/18 by Terence.Burns

	Fix for Android IAP query not returning entire inventory.

Change 2733174 on 2015/10/18 by Terence.Burns

	Fix Movie player issue where wait for movie to finish isnt being respected.

	Seems a stray bUserCanceled event flag was causing this not to be observed.

	Added some verbose logging to apple movie player.

Change 2733488 on 2015/10/19 by Mark.Satterthwaite

	Added the ability to merge the .ushadercache files used by the ShaderCache to store shader & draw state information.
	- Fixed a bug that would cause invalid shader membership and draw state information to be logged.
	- Added a separate command-line tool to merge shader cache files, currently Mac-only but in theory should work on other platforms too.

Change 2735226 on 2015/10/20 by Mark.Satterthwaite

	Fix temporal AA rendering on GL/Mac OS X - you can't rely on EyeAdaptation values unless SM5 is available so only perform that code on SM5 & we must correctly clamp saturate(NaN) to 0 as the current hlslcc won't do that for us (& is required by the HLSL spec). The latter used to be clamped in the AA_ALPHA && AA_VELOCITY_WEIGHTING code block that was removed recently.
	#jira UE-21214
	#jira UE-19913

Change 2736722 on 2015/10/21 by Daniel.Lamb

	Improved performance of cooking stats system.

Change 2737172 on 2015/10/21 by Daniel.Lamb

	Improved cooking stats performance for ddc stats.
2015-12-10 16:56:55 -05:00
Nick Shin
696c57ee72 HTML5: output "shareable link" when packaging has uploaded successfully to amazon's s3 servers
tested with phosphor's AWS S3 KeyID & Secret Access Key

#lockdown josh.adams
#jira UE-22574 - HTML5: Amazon S3 for HTML5 does not auto generate a shareable link of the packaged project

[CL 2742263 by Nick Shin in Main branch]
2015-10-26 16:47:53 -04:00
Nick Shin
a592058439 remove the read-only file-attribute before copy .htaccess
#lockdown josh.adams
#jira UE-22014 - Failure during packaging projects for HTML5

[CL 2730601 by Nick Shin in Main branch]
2015-10-15 16:17:26 -04:00
Ben Marsh
57097692aa Change deployment context and project params to use file references rather than raw paths.
[CL 2707182 by Ben Marsh in Main branch]
2015-09-26 14:41:15 -04:00
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]
2015-09-15 10:35:25 -04:00
Peter Sauerbrei
e706287759 Speed up reading and accessing ini files from UAT/UBT
#uat
#ubt
#codereview ben.marsh, wes.hunt

[CL 2691637 by Peter Sauerbrei in Main branch]
2015-09-15 09:29:42 -04:00
Ben Marsh
9610023ca5 Use FileReference and DirectoryReference classes instead of strings for paths. Massively reduces the amount of paranoid calls to GetFullPath(), CleanDirectorySeparators() et al., and improves performance for really common UBT operations like making relative paths or checking if files are under a directory. Strong typing ensures that intention of parameters is explicit.
[CL 2678429 by Ben Marsh in Main branch]
2015-09-03 08:47:24 -04:00
James Moran
52722d49c4 Don't use AppendLine on StringBuilder is it outputs system dependent line endings. Manually output \\n instead.
Fixes UE-20380

[CL 2672115 by James Moran in Main branch]
2015-08-28 06:22:04 -04:00
James Moran
c53f5a47cb When copying the html5 helper command template remove any read only file attributes.
Fixes issues when attempting to write to these files.

[CL 2668953 by James Moran in Main branch]
2015-08-26 04:36:06 -04:00
Peter Sauerbrei
34146c450d refactored Log to LogLog and LogConsole to Log
#uat

[CL 2662556 by Peter Sauerbrei in Main branch]
2015-08-20 09:37:11 -04:00
Ben Marsh
47c58ec57c Rename the ErrorCodes enum to ExitCode, and ErrorCodes.Error_Success to ExitCode.Success.
[CL 2662478 by Ben Marsh in Main branch]
2015-08-20 08:38:09 -04:00
James Moran
d25a9d8094 Mac HTML5LaunchHelper script is now copied instead of created to keep file permissions (i.e. +x).
Mark HTML5LaunchHelper script as executable.
Script handles spaces when pushing working directory.
Fixes UE-19637 (again)

[CL 2654364 by James Moran in Main branch]
2015-08-13 05:21:11 -04:00
James Moran
2a1ba3ccad Packaging HTML5 deploys double-click script for HTML5LaunchHelper to avoid using the command line.
Fixes UE-19637

[CL 2647934 by James Moran in Main branch]
2015-08-07 11:00:13 -04:00
Ankit Khare
08ec877c77 Always copy web server during packaging itself too for html5. #jira UE-19556
[CL 2643992 by Ankit Khare in Main branch]
2015-08-04 16:19:39 -04:00
Peter Sauerbrei
dc1d815f84 refactored the logging system for UAT/UBT to be more like UE4
we now use an enum similar to UE4 with Fatal, Error, Warning, Display, Log, Verbose, and VeryVerbose
Log will only go to the log file unless -verbose is passed on the command line
reduced some of the output from UAT to be Log only

[CL 2631062 by Peter Sauerbrei in Main branch]
2015-07-23 14:51:46 -04:00
Ankit Khare
9f0dbaee08 #html5 fix packaging when prebuildsync was not called ( packaging content only games, sync'd from perforce)
[CL 2622371 by Ankit Khare in Main branch]
2015-07-15 16:37:24 -04:00
James Moran
e89583075e emscripten's file_packager.py requires EM_CONFIG is set before it's run.
#codereview ankit.khare

[CL 2615093 by James Moran in Main branch]
2015-07-09 10:31:56 -04:00
Ben Marsh
a8fbbae1a8 Fix compile failure on Mac due to unused variable warning being treated as an error.
#codereview Ankit.Khare

[CL 2611916 by Ben Marsh in Main branch]
2015-07-06 20:53:10 -04:00
Ankit Khare
bd63d0b413 UEPLAT-790: One click integeration with CDNs #html5
This allows the build to be uploaded Amazon S3 during packaging. the game http link can directly shared with other people.  This does not depend on AMZ SDK and only uses REST API.

[CL 2611867 by Ankit Khare in Main branch]
2015-07-06 19:26:15 -04:00
Ankit Khare
3f5f900855 Fix HTML5Launcher to correctly launch Safari and only attach to localhost by default. (attaching to other interfaces is behind a command line argument now - existing code causes issues on Windows with UAC and on stock Mac)
[CL 2610709 by Ankit Khare in Main branch]
2015-07-05 22:57:28 -04:00
Ankit Khare
9b38554ee8 UEPLAT-826 : use HTML5 SDK from third party directories.
- Always pickup HTML5 sdk from third party directory.
   - Use the new html5 template by default.

[CL 2610587 by Ankit Khare in Main branch]
2015-07-04 18:45:54 -04:00
Wes Hunt
506f7e64a4 UEB-260 - Break AutomationTool into AutomationUtils that all automation projects depend on, and AutomationTool, which essentially only contains the startup code.
* Remove ErrorReporter.Error, replace with AutomationException with Error Code.
* Move ErrorCodes to AutomationException.
* Don't return exit codes. Solely rely on exceptions to propagate exit codes.
* Remove MainProc delegate
* Remove setting of Environment.ExitCode as it is ignored when main returns an int.
* ShutdownLogging is nothrow, as all exceptions would be ignored anyway.
* Wrap all shutdown steps so further ones get a chance to run.
* Move HostPlatform.Initialize into the global try/catch block
#codereview:ben.marsh

[CL 2605826 by Wes Hunt in Main branch]
2015-06-30 11:40:05 -04:00