Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4502288 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4502301 by ben marsh in Dev-VR branch]
This commit is contained in:
ben marsh
2018-10-24 11:55:58 -04:00
parent c538205c69
commit 5a701625db
699 changed files with 68356 additions and 19212 deletions

View File

@@ -689,7 +689,7 @@ public:
if (bOpenGL3x)
{
DeviceSpecs.AndroidProperties.GLES31RHIState.SupportsInstancing = true;
DeviceSpecs.AndroidProperties.GLES31RHIState.MaxTextureDimensions = 2048;
DeviceSpecs.AndroidProperties.GLES31RHIState.MaxTextureDimensions = 4096;
DeviceSpecs.AndroidProperties.GLES31RHIState.MaxShadowDepthBufferSizeX = 2048;
DeviceSpecs.AndroidProperties.GLES31RHIState.MaxShadowDepthBufferSizeY = 2048;
DeviceSpecs.AndroidProperties.GLES31RHIState.MaxCubeTextureDimensions = 2048;
@@ -701,7 +701,7 @@ public:
// OpenGL ES 2.0
{
DeviceSpecs.AndroidProperties.GLES2RHIState.SupportsInstancing = false;
DeviceSpecs.AndroidProperties.GLES2RHIState.MaxTextureDimensions = 1024;
DeviceSpecs.AndroidProperties.GLES2RHIState.MaxTextureDimensions = 2048;
DeviceSpecs.AndroidProperties.GLES2RHIState.MaxShadowDepthBufferSizeX = 1024;
DeviceSpecs.AndroidProperties.GLES2RHIState.MaxShadowDepthBufferSizeY = 1024;
DeviceSpecs.AndroidProperties.GLES2RHIState.MaxCubeTextureDimensions = 512;