X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glstate.cpp;h=bbf8adcd8971aeeef94b4850398c494f732e601b;hb=79ae5703b55b13194e1dc50db7f5813d107e8806;hp=aaf4d4bd6b6b5b15c4a67c9c3f51947b1a5b0d91;hpb=456c28d13fb5b073e88535395da24f4cd7d23251;p=apitrace

diff --git a/glstate.cpp b/glstate.cpp
index aaf4d4b..bbf8adc 100644
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -455,7 +455,7 @@ dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix)
 
     GLint max_program_local_parameters = 0;
     glGetProgramivARB(target, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &max_program_local_parameters);
-    for (GLuint index = 0; index < max_program_local_parameters; ++index) {
+    for (GLint index = 0; index < max_program_local_parameters; ++index) {
         GLdouble params[4] = {0, 0, 0, 0};
         glGetProgramLocalParameterdvARB(target, index, params);
 
@@ -464,7 +464,7 @@ dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix)
         }
 
         char name[256];
-        snprintf(name, sizeof name, "%sprogram.local[%u]", prefix, index);
+        snprintf(name, sizeof name, "%sprogram.local[%i]", prefix, index);
 
         json.beginMember(name);
         json.beginArray();
@@ -478,7 +478,7 @@ dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix)
 
     GLint max_program_env_parameters = 0;
     glGetProgramivARB(target, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &max_program_env_parameters);
-    for (GLuint index = 0; index < max_program_env_parameters; ++index) {
+    for (GLint index = 0; index < max_program_env_parameters; ++index) {
         GLdouble params[4] = {0, 0, 0, 0};
         glGetProgramEnvParameterdvARB(target, index, params);
 
@@ -487,7 +487,7 @@ dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix)
         }
 
         char name[256];
-        snprintf(name, sizeof name, "%sprogram.env[%u]", prefix, index);
+        snprintf(name, sizeof name, "%sprogram.env[%i]", prefix, index);
 
         json.beginMember(name);
         json.beginArray();
@@ -591,7 +591,7 @@ dumpTextureImage(JSONWriter &json, GLenum target, GLint level)
         json.beginMember("__data__");
         char *pngBuffer;
         int pngBufferSize;
-        Image::writePixelsToBuffer(pixels, width, height, 4, false, &pngBuffer, &pngBufferSize);
+        Image::writePixelsToBuffer(pixels, width, height, 4, true, &pngBuffer, &pngBufferSize);
         json.writeBase64(pngBuffer, pngBufferSize);
         free(pngBuffer);
         json.endMember(); // __data__
@@ -949,7 +949,7 @@ dumpReadBufferImage(JSONWriter &json, GLint width, GLint height, GLenum format)
     json.beginMember("__data__");
     char *pngBuffer;
     int pngBufferSize;
-    Image::writePixelsToBuffer(pixels, width, height, channels, false, &pngBuffer, &pngBufferSize);
+    Image::writePixelsToBuffer(pixels, width, height, channels, true, &pngBuffer, &pngBufferSize);
     //std::cerr <<" Before = "<<(width * height * channels * sizeof *pixels)
     //          <<", after = "<<pngBufferSize << ", ratio = " << double(width * height * channels * sizeof *pixels)/pngBufferSize;
     json.writeBase64(pngBuffer, pngBufferSize);