D3D11: Buffers larger than MAX_UNIFORM_BLOCK_SIZE

src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp

@@ -684,8 +684,9 @@ angle::Result Buffer11::getConstantBufferRange(const gl::Context *context,
                                                UINT *numConstantsOut)
 {
     NativeStorage *bufferStorage = nullptr;
-
-    if (offset == 0 || mRenderer->getRenderer11DeviceCaps().supportsConstantBufferOffsets)
+    if ((offset == 0 &&
+         size < static_cast<GLsizeiptr>(mRenderer->getNativeCaps().maxUniformBlockSize)) ||
+        mRenderer->getRenderer11DeviceCaps().supportsConstantBufferOffsets)
     {
         ANGLE_TRY(getBufferStorage(context, BUFFER_USAGE_UNIFORM, &bufferStorage));
         CalculateConstantBufferParams(offset, size, firstConstantOut, numConstantsOut);
@@ -1217,9 +1218,12 @@ void Buffer11::NativeStorage::FillBufferDesc(D3D11_BUFFER_DESC *bufferDesc,
 
             // Note: it seems that D3D11 allows larger buffers on some platforms, but not all.
             // (Windows 10 seems to allow larger constant buffers, but not Windows 7)
-            bufferDesc->ByteWidth =
-                std::min<UINT>(bufferDesc->ByteWidth,
-                               static_cast<UINT>(renderer->getNativeCaps().maxUniformBlockSize));
+            if (!renderer->getRenderer11DeviceCaps().supportsConstantBufferOffsets)
+            {
+                bufferDesc->ByteWidth = std::min<UINT>(
+                    bufferDesc->ByteWidth,
+                    static_cast<UINT>(renderer->getNativeCaps().maxUniformBlockSize));
+            }
             break;
 
         case BUFFER_USAGE_RAW_UAV:

src/tests/gl_tests/UniformBufferTest.cpp

@@ -1515,11 +1515,10 @@ TEST_P(UniformBufferTest, DependentBufferChange)
 
 // Recreate WebGL conformance test conformance2/uniforms/large-uniform-buffers.html to test
 // regression in http://anglebug.com/3388
-TEST_P(UniformBufferTest, SizeOver65535)
+TEST_P(UniformBufferTest, SizeOverMaxBlockSize)
 {
-    // UBOs sized above 65535 do not appear to work on D3D11
-    // http://anglebug.com/3388
-    ANGLE_SKIP_TEST_IF(IsD3D11());
+    // Test crashes on Windows AMD OpenGL
+    ANGLE_SKIP_TEST_IF(IsAMD() && IsWindows() && IsOpenGL());
 
     ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFragmentShader);
 
@@ -1546,10 +1545,14 @@ TEST_P(UniformBufferTest, SizeOver65535)
     glGetActiveUniformBlockiv(program, uboIndex, GL_UNIFORM_BLOCK_DATA_SIZE, &uboDataSize);
     EXPECT_NE(uboDataSize, 0);  // uniform block data size invalid
 
+    GLint64 maxUniformBlockSize;
+    glGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &maxUniformBlockSize);
+
     GLBuffer uboBuf;
-    std::array<GLfloat, 0x20000> uboData;
+    std::vector<GLfloat> uboData;
+    uboData.resize(maxUniformBlockSize * 2);  // underlying data is twice the max block size
 
-    GLint offs0 = 0x00000;
+    GLint offs0 = 0;
 
     // Red
     uboData[offs0 + 0] = 1;
@@ -1557,7 +1560,7 @@ TEST_P(UniformBufferTest, SizeOver65535)
     uboData[offs0 + 2] = 0;
     uboData[offs0 + 3] = 1;
 
-    GLint offs1     = 0x10000;
+    GLint offs1     = maxUniformBlockSize;
     GLint alignment = 0;
     glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &alignment);
     EXPECT_EQ(offs1 % alignment, 0);