Fix max units computation.

My thinko while tweaking Imre's e68b8d68741f2559a4be34d53b8aa3c7ed761471 patch.

diff --git a/retrace/glstate_images.cpp b/retrace/glstate_images.cpp
index f16cba41194a3c5b58ff219b1ec8fcc70d6c762a..84c6db1793b88b0581457fd39f746b2362145929 100644 (file)
--- a/retrace/glstate_images.cpp
+++ b/retrace/glstate_images.cpp
@@ -467,7 +467,7 @@ dumpTextures(JSONWriter &json, Context &context)
      * 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);
+    max_units = std::max(max_units, 2);
 
     for (GLint unit = 0; unit < max_units; ++unit) {
         GLenum texture = GL_TEXTURE0 + unit;

diff --git a/retrace/glstate_params.py b/retrace/glstate_params.py
index e1f90d0a244e302d6a0e0c7d047870da07337be7..32f7f7ca50da65fda2a20fd5a5316b55bd1b41d7 100644 (file)
--- a/retrace/glstate_params.py
+++ b/retrace/glstate_params.py
@@ -394,7 +394,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::min(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
+        print '        GLint max_units = std::max(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);'