Make eglretrace.cpp depend on gles api spec

[apitrace] / glstate.cpp

diff --git a/glstate.cpp b/glstate.cpp
index 0dff118b87dc5558d6f64480a1e0ec9bd2528c90..329276ffdf0b38e9ba8e91fcb9a36241b80c91c8 100644 (file)
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -591,8 +591,8 @@ dumpTextureImage(JSONWriter &json, GLenum target, GLint level)
 
         GLint active_texture = GL_TEXTURE0;
         glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture);
-        snprintf(label, sizeof label, "%s, %s, %s, %d level",
-                 enumToString(active_texture), enumToString(target), enumToString(format), level);
+        snprintf(label, sizeof label, "%s, %s, level = %d",
+                 enumToString(active_texture), enumToString(target), level);
 
         json.beginMember(label);
 
@@ -605,6 +605,8 @@ dumpTextureImage(JSONWriter &json, GLenum target, GLint level)
         json.writeNumberMember("__height__", height);
         json.writeNumberMember("__depth__", depth);
 
+        json.writeStringMember("__format__", enumToString(format));
+
         // Hardcoded for now, but we could chose types more adequate to the
         // texture internal format
         json.writeStringMember("__type__", "uint8");
@@ -736,6 +738,7 @@ getDrawableBounds(GLint *width, GLint *height) {
 
 #else
 
+#if !TRACE_EGL
     Display *display;
     Drawable drawable;
     Window root;
@@ -758,6 +761,9 @@ getDrawableBounds(GLint *width, GLint *height) {
 
     *width = w;
     *height = h;
+#else
+    return false;
+#endif
 
 #endif
 
@@ -823,7 +829,7 @@ getTextureLevelSize(GLint texture, GLint level, GLint *width, GLint *height)
 }
 
 
-static GLint
+static GLenum
 getTextureLevelFormat(GLint texture, GLint level)
 {
     GLenum target;
@@ -860,6 +866,22 @@ getRenderbufferSize(GLint renderbuffer, GLint *width, GLint *height)
 }
 
 
+static GLenum
+getRenderbufferFormat(GLint renderbuffer)
+{
+    GLint bound_renderbuffer = 0;
+    glGetIntegerv(GL_RENDERBUFFER_BINDING, &bound_renderbuffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
+
+    GLint format = GL_NONE;
+    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_INTERNAL_FORMAT, &format);
+
+    glBindRenderbuffer(GL_RENDERBUFFER, bound_renderbuffer);
+    
+    return format;
+}
+
+
 static bool
 getFramebufferAttachmentSize(GLenum target, GLenum attachment, GLint *width, GLint *height)
 {
@@ -915,18 +937,13 @@ getFramebufferAttachmentFormat(GLenum target, GLenum attachment)
     }
 
     if (object_type == GL_RENDERBUFFER) {
-        GLint format = GL_NONE;
-        glGetRenderbufferParameteriv(object_name, GL_RENDERBUFFER_INTERNAL_FORMAT,
-                                     &format);
-        return format;
+        return getRenderbufferFormat(object_name);
     } else if (object_type == GL_TEXTURE) {
         GLint texture_level = 0;
         glGetFramebufferAttachmentParameteriv(target, attachment,
                                               GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL,
                                               &texture_level);
-
-        GLint format = getTextureLevelFormat(object_name, texture_level);
-        return format;
+        return getTextureLevelFormat(object_name, texture_level);
     } else {
         std::cerr << "warning: unexpected GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE = " << object_type << "\n";
         return GL_NONE;
@@ -1009,7 +1026,8 @@ getDrawBufferImage(GLenum format) {
  * Dump the image of the currently bound read buffer.
  */
 static inline void
-dumpReadBufferImage(JSONWriter &json, GLint width, GLint height, GLenum format)
+dumpReadBufferImage(JSONWriter &json, GLint width, GLint height, GLenum format,
+                    GLint internalFormat = GL_NONE)
 {
     GLint channels = __gl_format_channels(format);
 
@@ -1022,6 +1040,8 @@ dumpReadBufferImage(JSONWriter &json, GLint width, GLint height, GLenum format)
     json.writeNumberMember("__height__", height);
     json.writeNumberMember("__depth__", 1);
 
+    json.writeStringMember("__format__", enumToString(internalFormat));
+
     // Hardcoded for now, but we could chose types more adequate to the
     // texture internal format
     json.writeStringMember("__type__", "uint8");
@@ -1223,15 +1243,9 @@ dumpFramebufferAttachment(JSONWriter &json, GLenum target, GLenum attachment, GL
     }
 
     GLint internalFormat = getFramebufferAttachmentFormat(target, attachment);
-    std::stringstream ss;
-    ss << enumToString(attachment);
-    if (internalFormat != GL_NONE) {
-        ss << ", ";
-        ss << enumToString(internalFormat);
-    }
 
-    json.beginMember(ss.str());
-    dumpReadBufferImage(json, width, height, format);
+    json.beginMember(enumToString(attachment));
+    dumpReadBufferImage(json, width, height, format, internalFormat);
     json.endMember();
 }