Commit Graph

29 Commits

Author SHA1 Message Date
Luke Thatcher
ee64a28f30 Copying //UE5/Dev-ParallelRendering to //UE5/Main
This change is the copy-up of work from //UE5/Dev-ParallelRendering to unify the various RHI texture types
 - The separate RHI texture types (FRHITexture2D, FRHITexture2DArray, FRHITexture3D, FRHITextureCube, FRHITextureCubeArray) have been replaced with a single type: FRHITexture.
 - Includes the required refactoring / fixes for the various platform RHIs.

The old texture types are still supported via typedefs, but will soon be marked deprecated. Future rendering code should make use of the FRHITexture type instead.

#jira UE-139559
#rb Mihnea.Balta
#preflight 622f3af819287beb2c3047f6
#robomerge[FN_ENGINEMERGE] DEV-NC

[CL 19371962 by Luke Thatcher in ue5-main branch]
2022-03-14 09:14:58 -04:00
chris babcock
85e722a84d Fix installed SDK components and min and max buils-tools used for Android
#jira UE-139924
#android
[REVIEW] [at]Allan.Bentham
#rb Allan.Bentham
#preflight local

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 18901617 in //UE5/Release-5.0/... via CL 18901767 via CL 18901860
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v912-18901109)

[CL 18901888 by chris babcock in ue5-main branch]
2022-02-08 09:46:18 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
rolando caloca
f6cd88c157 UE5 - Remove platform
#rb Steve.Smith
[FYI] Jules.Blok, Ryan.Durand, Ben.Marsh

#ROBOMERGE-SOURCE: CL 17295935 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17295945 by rolando caloca in ue5-release-engine-test branch]
2021-08-24 19:28:38 -04:00
velvet22
5afad9b80a PR #8232: fix fallback location check in SetupAndroid.bat (Contributed by velvet22)
#ue5
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 17108115 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v854-17104634)

[CL 17108140 by velvet22 in ue5-release-engine-test branch]
2021-08-09 17:36:38 -04:00
chris babcock
caf5b1ebe2 Fix SetupAndroid.bat to handle unexpected characters in user path
#jira UE-119965
#ue4
#android
#rb Brantley.Collins

#ROBOMERGE-SOURCE: CL 17107816 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v854-17104634)

[CL 17107916 by chris babcock in ue5-release-engine-test branch]
2021-08-09 17:18:06 -04:00
brandon schaefer
2a23bc9489 Fix Android setup for Linux, add TODO for Mac
#jira UE-109276, UE-109272
[at]Chris.Babcock, [at]Josh.Adams, [at]Nuno.Leiria, [at]James.Singer
#rb Chris.Babcock, James.Singer
[FYI] Will.Damon, Dave.Hunter

#ROBOMERGE-SOURCE: CL 16317826 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16317834 by brandon schaefer in ue5-release-engine-test branch]
2021-05-13 16:13:28 -04:00
jules blok
dd0aab265a Use the custom linker to build large projects on Lumin
#rb Steve.Smith
#rb Chris.Babcock
#jira UE-109517

#ROBOMERGE-SOURCE: CL 15678897 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15679229 by jules blok in ue5-main branch]
2021-03-11 14:36:16 -04:00
brandon schaefer
877fe86d76 Fix extra % added to ENV path
#jira none
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 15557590 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15557597 by brandon schaefer in ue5-main branch]
2021-03-01 11:16:43 -04:00
Josh Adams
a3869f12d5 - Android Turnkey support for prerequisites (making sure Android Studio has been installed and run once sdk directory creation)
- Updated versioning to pass to SetupAndroid scripts instead of the script hardcoding it
- Added idea of code-based "FileSource" objects that can be used to install an SDK without needing to copy an installer, it's all in the SDKInstall command
- Prereqs are not working yet for Mac/Linux (logic will need to be ported on those platforms to get it right)
#rb chris.babcock

[CL 15298669 by Josh Adams in ue5-main branch]
2021-02-03 14:18:15 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -04:00
chris babcock
d2cb08954c Replacement ld.lld for Window and OSX corrects CALL26 issues with large Android projects
#jira UE-92676
#ue4
#android
#rb Florin.Pascu

#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 13185974 in //UE4/Release-4.25/... via CL 13186065 via CL 13186177
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13186231 by chris babcock in Main branch]
2020-05-05 15:17:41 -04:00
florin pascu
9ce469e211 Add new line before any echo in SetupAndroid
#jira UE-92410
#rb Brandon.Schaefer, Chris.Babcock

#ROBOMERGE-SOURCE: CL 13034767 in //UE4/Release-4.25/... via CL 13034769 via CL 13034773
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034779 by florin pascu in Main branch]
2020-04-24 13:20:54 -04:00
chris babcock
75cc173b52 Remove check for ANDROID_HOME from Mac and Linux
Run SetupAndroid.command if SetupAndroid.sh is run on Mac instead

#jira UE-92346
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 12983953 in //UE4/Release-4.25/... via CL 12983957 via CL 12983966
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12983972 by chris babcock in Main branch]
2020-04-22 16:21:18 -04:00
brandon schaefer
2a478809cf Fix android setup script for Linux/Mac
#jira none
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 12978854 in //UE4/Release-4.25/... via CL 12978869 via CL 12978892
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12978920 by brandon schaefer in Main branch]
2020-04-22 13:40:04 -04:00
chris babcock
f1931debe2 Update SetupAndroid scripts to install Android NDK 21b with fixed clang for x86_64
#jira UE-89957
#ue4
[FYI] Jack.Porter
#android
#rb Trevor.Stone

#ROBOMERGE-SOURCE: CL 12941104 in //UE4/Release-4.25/... via CL 12941110 via CL 12941115
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12941120 by chris babcock in Main branch]
2020-04-20 19:56:37 -04:00
chris babcock
b677104d28 Add alternative location for sdkmanager (moved with newer Android Studio isntalls)
#jira UE-92180
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 12905253 in //UE4/Release-4.25/... via CL 12905255 via CL 12905256
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907669 by chris babcock in Main branch]
2020-04-18 16:05:38 -04:00
brandon schaefer
2a93765bdc export PATH for Linux/Mac SetupAndroid scripts
#jira none
#android
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 11578061 in //UE4/Release-4.25/... via CL 11578064
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11585441 by brandon schaefer in Main branch]
2020-02-22 18:15:01 -05:00
brandon schaefer
6d04247d54 SetupAndroid for Linux
#jira none
#android
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 11578009 in //UE4/Release-4.25/... via CL 11578010
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11585433 by brandon schaefer in Main branch]
2020-02-22 18:14:54 -05:00
chris babcock
049581851e Add Mac version of SetupAndroid script
#jira none
#ue4
#android
#rb none

#ROBOMERGE-SOURCE: CL 11577334 in //UE4/Release-4.25/... via CL 11577335
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11585414 by chris babcock in Main branch]
2020-02-22 18:13:58 -05:00
john mauney
0cb8e2a7bb Fix batch file variable declaration
#jira none
#ue4
#android
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 11558777 in //UE4/Release-4.25/... via CL 11558779
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579553 by john mauney in Main branch]
2020-02-21 17:42:15 -05:00
chris babcock
3d93697b51 Remove CodeWorks for Android and add setup batch file
#jira none
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 11558432 in //UE4/Release-4.25/... via CL 11558446
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579545 by chris babcock in Main branch]
2020-02-21 17:42:11 -05:00
Nick Penwarden
828f57e397 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main)
#lockdown Ben.Marsh

Change 2718980 on 2015/10/07 by Dmitriy.Dyomin
	UWorld::CreateWorld: remove commandlet-specific behavior (Contributed by slonopotamus)

Change 2719155 on 2015/10/07 by Allan.Bentham
	HQ ES2 Reflections, selects the nearest 3 reflection captures to the primitive and reflects around the captures themselves (parallax correction).

Change 2724572 on 2015/10/12 by Jack.Porter
	Fix for landscape disappearing when using  r.forcelod

Change 2726062 on 2015/10/13 by Jack.Porter

	Merged CL2726057 from 4.10
	Fixed issues with landscape mirror tool on landscapes substantially above and below the zero line
	Fixed problem where landscape grass was not invalidated after using the mirror tool

Change 2726133 on 2015/10/13 by Jack.Porter
	Fix for Device Profiles editor missing specific Android device profiles
	Fix for Device Profiles editor creating blank device profiles for Android cook variant "platforms"

Change 2736210 on 2015/10/21 by Dmitriy.Dyomin
	Mobile Rendering: ReceiveDecals flag support for all meshes (previously only for skeletal meshes)

Change 2736463 on 2015/10/21 by Jack.Porter
	Merge of 4.10 CL 2736461
	Fixed Landscape disappearing when Layer Debug visualization selected outside Landscape edit mode

Change 2742855 on 2015/10/27 by Dmitriy.Dyomin
	Fixed: World origin offset handling for UInterpToMovementComponent
	https://udn.unrealengine.com/questions/266512/uinterptomovementcomponent-doesnt-update-with-worl.html

Change 2745055 on 2015/10/28 by Allan.Bentham
	Update reflection captures (via update captures button) now works when mobile preview is active.

Change 2755668 on 2015/11/05 by Allan.Bentham
	Use distance from shadow view to object instead of view space Z.

Change 2762186 on 2015/11/11 by Jack.Porter
	The user can now specify the relative priority for each Android texture format in Project Settings. This will affect the format selected for Launch on Device and by the device for projects packaged using the Android_Multi target

Change 2765902 on 2015/11/13 by Gareth.Martin
	Landscape per-component layer whitelisting basic functionality

Change 2769487 on 2015/11/17 by Jack.Porter
	Support reflection viewmode on ES2 Preview

Change 2769576 on 2015/11/17 by Gareth.Martin
	Improved landscape per-component layer whitelisting functionality
	- added shortcut keys (plus/minus + click) to whitelist/un-whitelist a layer from the paint tool
	- automatically added components' painted layers to the component whitelists when enabling whitelist restriction

Change 2771223 on 2015/11/18 by Gareth.Martin
	Improved landscape per-component layer whitelisting functionality
	- Removing a layer from the whitelist will now delete its data from the component

Change 2777862 on 2015/11/23 by Gareth.Martin
	Improved landscape per-component layer whitelisting functionality
	 - on the shared verts on component edges/corners painting must now pass the whitelist of all components sharing the vert or it won't paint, rather than causing a disconnect
	Better handling of erasing 100%-painted areas of blended landscape weightmap
	 - It will now pick the first other painted layer on that component to fill the erased value with, so 100% areas of blended layers are now erasable.
	 - todo: erasing can still cause disconnects on shared edge verts

Change 2780470 on 2015/11/25 by Dmitriy.Dyomin
	Use hardware instancing when device supports it

Change 2780679 on 2015/11/25 by Jack.Porter
	Landscape layer usage viewmode

Change 2781878 on 2015/11/26 by Gareth.Martin
	Better handling of erasing 100%-painted areas of blended landscape weightmap
	 - It will now pick the *most painted* other painted layer on that component to fill the erased value with, and correctly takes shared edge/corner verts into account
	Various fixes to TMap/TSet/TFixedSizeArrayView - all reviewed by Core

Change 2782214 on 2015/11/27 by Allan.Bentham
	Prevent editor's ES2 emulation shaders degamma-ing the alpha channel when reading material textures.
	Merging using Ronin-To-UE4-Dev-Mobile

Change 2782536 on 2015/11/30 by Jack.Porter
	When updating reflection captures in ES2 mode, first wait for any shader compilation initiated by the feature level switch to complete

Change 2792617 on 2015/12/07 by Jack.Porter
	Added a Project Setting to edit the r.DiscardUnusedQuality console variable

Change 2792618 on 2015/12/07 by Gareth.Martin
	Baking landscape material world-position-offset into collision

Change 2794270 on 2015/12/08 by Dmitriy.Dyomin
	DynamicMeshBuilder uses 16bit index buffer on ES2 platforms

Change 2794556 on 2015/12/08 by Allan.Bentham
	Fix incorrect mip/roughness selection for HQ reflections.
	Fixed couple of merge issues.

Change 2794568 on 2015/12/08 by Gareth.Martin
	Fix black spot / hole if all layers on a component use height blending and add to <= 0

[CL 2796640 by Nick Penwarden in Main branch]
2015-12-09 15:04:15 -05:00