Correct calculation of GL_MAX_VARYING_COMPONENTS

gary-sweet · Commit Bot · commit 07d3bcf1c443 · 2019-12-21T22:36:15.000Z
GL_MAX_VARYING_COMPONENTS does not equal maxVertexOutputComponents. The minimum supported limit for GL_MAX_VARYING_COMPONENTS is 60, whereas the minimum for maxVertexOutputComponents is 64. On devices that have the minimum limits the existing code will report a limit for GL_MAX_VARYING_COMPONENTS that is too large (64 vs 60). Report instead as (GL_MAX_VARYING_VECTORS * 4). Bug: angleproject:4233 Change-Id: I920a32cf21040ff5b64746fcf3489db740028d48 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1978638 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
@@ -1493,7 +1493,7 @@ void Context::getIntegervImpl(GLenum pname, GLint *params)
             *params = mState.mCaps.maxVaryingVectors;
             break;
         case GL_MAX_VARYING_COMPONENTS:
-            *params = mState.mCaps.maxVertexOutputComponents;
+            *params = mState.mCaps.maxVaryingVectors * 4;
             break;
         case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS:
             *params = mState.mCaps.maxCombinedTextureImageUnits;
