From: Imre Deak <imre.deak@intel.com>
Date: Mon, 9 Apr 2012 16:35:41 +0000 (+0300)
Subject: gles: sanity check GL_COMBINED_TEXTURE_IMAGE_UNITS
X-Git-Tag: 2.0_alpha^2~150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e68b8d68741f2559a4be34d53b8aa3c7ed761471;p=tools%2Fapitrace.git

gles: sanity check GL_COMBINED_TEXTURE_IMAGE_UNITS

At least the Android software GL implementation doesn't return the
proper value for this, but rather returns 0. The GL(ES) specification
mandates a minimum value of 2, so use this as a fall-back value.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>
---

diff --git a/glstate_images.cpp b/glstate_images.cpp
index 2c7c66b..2d70d99 100644
--- a/glstate_images.cpp
+++ b/glstate_images.cpp
@@ -425,11 +425,20 @@ dumpTextures(JSONWriter &json, Context &context)
     json.beginObject();
     GLint active_texture = GL_TEXTURE0;
     glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture);
+
     GLint max_texture_coords = 0;
     glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);
     GLint max_combined_texture_image_units = 0;
     glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_combined_texture_image_units);
     GLint max_units = std::max(max_combined_texture_image_units, max_texture_coords);
+
+    /*
+     * At least the Android software GL implementation doesn't return the
+     * proper value for this, but rather returns 0. The GL(ES) specification
+     * mandates a minimum value of 2, so use this as a fall-back value.
+     */
+    max_units = std::min(max_units, 2);
+
     for (GLint unit = 0; unit < max_units; ++unit) {
         GLenum texture = GL_TEXTURE0 + unit;
         glActiveTexture(texture);
diff --git a/glstate_params.py b/glstate_params.py
index ad8e258..7c29932 100644
--- a/glstate_params.py
+++ b/glstate_params.py
@@ -392,7 +392,7 @@ class StateDumper:
         print '        glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);'
         print '        GLint max_combined_texture_image_units = 0;'
         print '        glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_combined_texture_image_units);'
-        print '        GLint max_units = std::max(max_combined_texture_image_units, max_texture_coords);'
+        print '        GLint max_units = std::min(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
         print '        for (GLint unit = 0; unit < max_units; ++unit) {'
         print '            char name[32];'
         print '            snprintf(name, sizeof name, "GL_TEXTURE%i", unit);'