Increase the varying register count to what the feature level supports.

src/libGLESv2/Context.cpp

@@ -2128,7 +2128,7 @@ float Context::getMaximumPointSize() const
 
 int Context::getMaximumVaryingVectors() const
 {
-    return mMajorShaderModel >= 3 ? MAX_VARYING_VECTORS_SM3 : MAX_VARYING_VECTORS_SM2;
+    return mRenderer->getMaxVaryingVectors();
 }
 
 unsigned int Context::getMaximumCombinedTextureImageUnits() const

src/libGLESv2/Context.h

@@ -58,17 +58,16 @@ class Query;
 
 enum
 {
+    MAX_DRAW_BUFFERS = 1,
+
     MAX_VERTEX_ATTRIBS = 16,
-    MAX_VARYING_VECTORS_SM2 = 8,
-    MAX_VARYING_VECTORS_SM3 = 10,
     MAX_TEXTURE_IMAGE_UNITS = 16,
 
-    // Implementation upper limit, for devices supporting vertex texture fetch. 
-    // Real limit depends on the shader model
+    // Implementation upper limits, real maximums depend on the hardware
     IMPLEMENTATION_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 16,
     IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS = MAX_TEXTURE_IMAGE_UNITS + IMPLEMENTATION_MAX_VERTEX_TEXTURE_IMAGE_UNITS,    
 
-    MAX_DRAW_BUFFERS = 1
+    IMPLEMENTATION_MAX_VARYING_VECTORS = 32
 };
 
 enum QueryType

src/libGLESv2/ProgramBinary.cpp

@@ -1174,7 +1174,7 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, std::string& pixelHLSL, std::
     }
 
     // Map the varyings to the register file
-    const Varying *packing[MAX_VARYING_VECTORS_SM3][4] = {NULL};
+    const Varying *packing[IMPLEMENTATION_MAX_VARYING_VECTORS][4] = {NULL};
     int registers = packVaryings(infoLog, packing, fragmentShader);
 
     if (registers < 0)

src/libGLESv2/renderer/Renderer.h

@@ -147,6 +147,7 @@ class Renderer
     virtual unsigned int getMaxVertexTextureImageUnits() const = 0;
     virtual int getMaxVertexUniformVectors() const = 0;
     virtual int getMaxFragmentUniformVectors() const = 0;
+    virtual int getMaxVaryingVectors() const = 0;
     virtual bool getNonPower2TextureSupport() const = 0;
     virtual bool getDepthTextureSupport() const = 0;
     virtual bool getOcclusionQuerySupport() const = 0;

src/libGLESv2/renderer/Renderer11.cpp

@@ -1884,6 +1884,21 @@ int Renderer11::getMaxFragmentUniformVectors() const
     return MAX_FRAGMENT_UNIFORM_VECTORS_D3D11;
 }
 
+int Renderer11::getMaxVaryingVectors() const
+{
+    META_ASSERT(gl::IMPLEMENTATION_MAX_VARYING_VECTORS == D3D11_VS_OUTPUT_REGISTER_COUNT);
+    switch (mFeatureLevel)
+    {
+      case D3D_FEATURE_LEVEL_11_0:
+        return D3D11_VS_OUTPUT_REGISTER_COUNT;
+      case D3D_FEATURE_LEVEL_10_1:
+      case D3D_FEATURE_LEVEL_10_0:
+        return D3D10_VS_OUTPUT_REGISTER_COUNT;
+      default: UNREACHABLE();
+        return 0;
+    }
+}
+
 bool Renderer11::getNonPower2TextureSupport() const
 {
     // TODO

src/libGLESv2/renderer/Renderer11.h

@@ -107,6 +107,7 @@ class Renderer11 : public Renderer
     virtual unsigned int getMaxVertexTextureImageUnits() const;
     virtual int getMaxVertexUniformVectors() const;
     virtual int getMaxFragmentUniformVectors() const;
+    virtual int getMaxVaryingVectors() const;
     virtual bool getNonPower2TextureSupport() const;
     virtual bool getDepthTextureSupport() const;
     virtual bool getOcclusionQuerySupport() const;

src/libGLESv2/renderer/Renderer9.cpp

@@ -2250,6 +2250,11 @@ int Renderer9::getMaxFragmentUniformVectors() const
     return getMajorShaderModel() >= 3 ? MAX_FRAGMENT_UNIFORM_VECTORS_SM3 : MAX_FRAGMENT_UNIFORM_VECTORS_SM2;
 }
 
+int Renderer9::getMaxVaryingVectors() const
+{
+    return getMajorShaderModel() >= 3 ? MAX_VARYING_VECTORS_SM3 : MAX_VARYING_VECTORS_SM2;
+}
+
 bool Renderer9::getNonPower2TextureSupport() const
 {
     return mSupportsNonPower2Textures;

src/libGLESv2/renderer/Renderer9.h

@@ -41,6 +41,8 @@ enum
     MAX_VERTEX_UNIFORM_VECTORS = D3D9_MAX_FLOAT_CONSTANTS - 2,   // Reserve space for dx_HalfPixelSize and dx_DepthRange.
     MAX_FRAGMENT_UNIFORM_VECTORS_SM2 = 32 - 3,    // Reserve space for dx_Coord, dx_DepthFront and dx_DepthRange.
     MAX_FRAGMENT_UNIFORM_VECTORS_SM3 = 224 - 3,
+    MAX_VARYING_VECTORS_SM2 = 8,
+    MAX_VARYING_VECTORS_SM3 = 10
 };
 
 class Renderer9 : public Renderer
@@ -134,6 +136,7 @@ class Renderer9 : public Renderer
     virtual unsigned int getMaxVertexTextureImageUnits() const;
     virtual int getMaxVertexUniformVectors() const;
     virtual int getMaxFragmentUniformVectors() const;
+    virtual int getMaxVaryingVectors() const;
     virtual bool getNonPower2TextureSupport() const;
     virtual bool getDepthTextureSupport() const;
     virtual bool getOcclusionQuerySupport() const;