Define all D2D/DWRITE GUIDs

[apitrace] / glstate.cpp

diff --git a/glstate.cpp b/glstate.cpp
index 665f887f20d317edd6ef45ca76b482e67975d66e..d54764ce7bf5e8b6c9b8db59bc420e88bebfa5a0 100644 (file)
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -738,6 +738,7 @@ getDrawableBounds(GLint *width, GLint *height) {
 
 #else
 
+#if !TRACE_EGL
     Display *display;
     Drawable drawable;
     Window root;
@@ -760,6 +761,9 @@ getDrawableBounds(GLint *width, GLint *height) {
 
     *width = w;
     *height = h;
+#else
+    return false;
+#endif
 
 #endif
 
@@ -825,7 +829,7 @@ getTextureLevelSize(GLint texture, GLint level, GLint *width, GLint *height)
 }
 
 
-static GLint
+static GLenum
 getTextureLevelFormat(GLint texture, GLint level)
 {
     GLenum target;
@@ -862,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)
 {
@@ -917,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;
@@ -938,7 +953,8 @@ getFramebufferAttachmentFormat(GLenum target, GLenum attachment)
 
 
 image::Image *
-getDrawBufferImage(GLenum format) {
+getDrawBufferImage() {
+    GLenum format = GL_RGB;
     GLint channels = __gl_format_channels(format);
     if (channels > 4) {
         return NULL;
@@ -1189,7 +1205,10 @@ dumpDrawableImages(JSONWriter &json)
         glGetIntegerv(GL_READ_BUFFER, &read_buffer);
 
         GLint alpha_bits = 0;
+#if 0
+        // XXX: Ignore alpha until we are able to match the traced visual
         glGetIntegerv(GL_ALPHA_BITS, &alpha_bits);
+#endif
         GLenum format = alpha_bits ? GL_RGBA : GL_RGB;
         json.beginMember(enumToString(draw_buffer));
         dumpReadBufferImage(json, width, height, format);
@@ -1214,6 +1233,8 @@ dumpDrawableImages(JSONWriter &json)
         json.endMember();
     }
 }
+
+
 /**
  * Dump the specified framebuffer attachment.
  *