commit b2f3d05cbed0cc635a64a4bff77767d656d41ead
author Geoff Lang <geofflang@google.com> Tue Aug 13 12:49:27 2013 -0400
committer Geoff Lang <geoff@vonture.net> Tue Aug 27 17:06:53 2013 -0400
tree 182d51cfc71e994ab3d6becd68e0ba989e8b7cb3
parent 9060a4e0c647c91f3d20a69f8470bb642706f1b2

Replaced the custom component type and SRGB bool with GLenums.

TRAC #23474

Author: Geoff Lang
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods

src/libGLESv2/renderer/Blit11.cpp

diff --git a/src/libGLESv2/renderer/Blit11.cpp b/src/libGLESv2/renderer/Blit11.cpp
index bd539d7..2256117 100644
--- a/src/libGLESv2/renderer/Blit11.cpp
+++ b/src/libGLESv2/renderer/Blit11.cpp
@@ -232,7 +232,7 @@
 
     BlitParameters parameters = { 0 };
     parameters.mDestinationFormat = destFormat;
-    parameters.mSignedInteger = gl::IsSignedIntegerFormat(sourceInternalFormat, mRenderer->getCurrentClientVersion());
+    parameters.mSignedInteger = gl::GetComponentType(sourceInternalFormat, mRenderer->getCurrentClientVersion()) == GL_INT;
     parameters.m3DBlit = sourceArea.depth > 1;
 
     BlitShaderMap::const_iterator i = mShaderMap.find(parameters);

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index d42ba46..3b8f428 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2494,7 +2494,8 @@
     unsigned int numCounts = 0;
 
     // D3D11 supports multisampling for signed and unsigned format, but ES 3.0 does not
-    if (!gl::IsIntegerFormat(internalFormat, getCurrentClientVersion()))
+    GLenum componentType = gl::GetComponentType(internalFormat, getCurrentClientVersion());
+    if (componentType != GL_INT && componentType != GL_UNSIGNED_INT)
     {
         DXGI_FORMAT format = gl_d3d11::GetRenderableFormat(internalFormat, getCurrentClientVersion());
         MultisampleSupportMap::const_iterator iter = mMultisampleSupportMap.find(format);
@@ -2518,8 +2519,11 @@
 void Renderer11::getSampleCounts(GLint internalFormat, GLsizei bufSize, GLint *params) const
 {
     // D3D11 supports multisampling for signed and unsigned format, but ES 3.0 does not
-    if (gl::IsIntegerFormat(internalFormat, getCurrentClientVersion()))
+    GLenum componentType = gl::GetComponentType(internalFormat, getCurrentClientVersion());
+    if (componentType == GL_INT || componentType == GL_UNSIGNED_INT)
+    {
         return;
+    }
 
     DXGI_FORMAT format = gl_d3d11::GetRenderableFormat(internalFormat, getCurrentClientVersion());
     MultisampleSupportMap::const_iterator iter = mMultisampleSupportMap.find(format);