commit def624bc0b6229c025a6373d7545af26463e2b2f
author Geoff Lang <geofflang@chromium.org> Mon Apr 13 10:46:56 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Tue Apr 14 19:34:32 2015 +0000
tree 28684ed71b63305cd2da6b41c83cb9f29e7dc4b0
parent a836e8830b580e6c88d340010d20708a0a8180d0

Move maxSamples from Extensions to Caps because it is an ES3 limit.

BUG=angleproject:886

Change-Id: Ibcfc2f06e8308e2e6eb1a6c38206b803f689d7af
Reviewed-on: https://chromium-review.googlesource.com/265470
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index f4f8e31..b557707 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -351,9 +351,9 @@
     ASSERT(samples == 0 || context->getExtensions().framebufferMultisample);
 
     // ANGLE_framebuffer_multisample states that the value of samples must be less than or equal
-    // to MAX_SAMPLES_ANGLE (Context::getExtensions().maxSamples) otherwise GL_INVALID_VALUE is
+    // to MAX_SAMPLES_ANGLE (Context::getCaps().maxSamples) otherwise GL_INVALID_VALUE is
     // generated.
-    if (static_cast<GLuint>(samples) > context->getExtensions().maxSamples)
+    if (static_cast<GLuint>(samples) > context->getCaps().maxSamples)
     {
         context->recordError(Error(GL_INVALID_VALUE));
         return false;