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

Merging //UE4/Dev-Main @ 4270639 to Dev-Core (//UE4/Dev-Core)

Browse Source 
#rb none
#lockdown Ben.Marsh

[CL 4271086 by Robert Manuszewski in Dev-Core branch]
This commit is contained in:
Robert Manuszewski
2018-08-09 03:09:56 -04:00
parent 5a48e69982
commit 0869284cf7
341 changed files with 124657 additions and 6928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Engine/Source/Developer/Android/AndroidTargetPlatform/Private/AndroidTargetPlatform.cpp
View File

@@ -208,6 +208,11 @@ FAndroidTargetPlatform::~FAndroidTargetPlatform()
FTicker::GetCoreTicker().RemoveTicker(TickDelegateHandle);
}
FAndroidTargetDevicePtr FAndroidTargetPlatform::CreateTargetDevice(const ITargetPlatform& InTargetPlatform, const FString& InSerialNumber, const FString& InAndroidVariant) const
{
return MakeShareable(new FAndroidTargetDevice(InTargetPlatform, InSerialNumber, InAndroidVariant));
}
bool FAndroidTargetPlatform::SupportsES2() const
{
// default to support ES2
@@ -778,8 +783,7 @@ bool FAndroidTargetPlatform::HandleTicker( float DeltaTime )
// create target device
FAndroidTargetDevicePtr& Device = Devices.Add(DeviceInfo.SerialNumber);
Device = CreateNewDevice(DeviceInfo);
Device = CreateTargetDevice(*this, DeviceInfo.SerialNumber, GetAndroidVariantName());
Device->SetConnected(true);
Device->SetModel(DeviceInfo.Model);

2
Engine/Source/Developer/Android/AndroidTargetPlatform/Private/AndroidTargetPlatform.h
View File

@@ -264,6 +264,8 @@ protected:
return true;
}
virtual FAndroidTargetDevicePtr CreateTargetDevice(const ITargetPlatform& InTargetPlatform, const FString& InSerialNumber, const FString& InAndroidVariant) const;
// query for rene3ring mode support
bool SupportsES2() const;
bool SupportsES31() const;