commit 5f4c46363bf8e7eb6852c3af42a2e57157e72113
author Geoff Lang <geofflang@chromium.org> Thu Jul 03 13:46:52 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Tue Jul 29 17:58:46 2014 +0000
tree 8e5ca9003d6b4ae15e0707fefc7511b6a41ce672
parent 8d62bcc4e282daff5d19966c8d7c9b1286f7607c

Use the FormatCaps for multisample validation and queries.

BUG=angle:658

Change-Id: Ic9fa53fb62d7eff62f07b68d7ddada461ecad859
Reviewed-on: https://chromium-review.googlesource.com/206832
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 5e2ec4a..3a45243 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -7904,10 +7904,12 @@
         {
           case GL_NUM_SAMPLE_COUNTS:
             if (bufSize != 0)
-                *params = context->getNumSampleCounts(internalformat);
+            {
+                *params = formatCaps.sampleCounts.size();
+            }
             break;
           case GL_SAMPLES:
-            context->getSampleCounts(internalformat, bufSize, params);
+            std::copy_n(formatCaps.sampleCounts.rbegin(), std::min<size_t>(bufSize, formatCaps.sampleCounts.size()), params);
             break;
           default:
             return gl::error(GL_INVALID_ENUM);