Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

#rb None
#jira None

[CL 4564204 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2018-11-13 23:40:18 -05:00
parent 85f45535b2
commit a400cb96bf
4948 changed files with 538347 additions and 178159 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;