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

#rb none

[CL 4543237 by Matt Kuhlenschmidt in Dev-Editor branch]
This commit is contained in:
Matt Kuhlenschmidt
2018-11-06 10:00:36 -05:00
2076 changed files with 104352 additions and 53770 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;