Fix several problems reported by valgrind

[gldbg.git] / flavors / gl / source / inspector.cpp

diff --git a/flavors/gl/source/inspector.cpp b/flavors/gl/source/inspector.cpp
index 122c2e45298f340ddfe935a2f5e29375dcde480c..6ff3f7033fa86180b2317f85f2e2d6a443f5800b 100644 (file)
--- a/flavors/gl/source/inspector.cpp
+++ b/flavors/gl/source/inspector.cpp
@@ -21,6 +21,8 @@ Inspector::Inspector(GlDbg &d):
                .set_help("Inspects general GL state",
                        "state vertex\n"
                        "  Print current vertex attributes\n\n"
+                       "state array\n"
+                       "  Show current vertex arrays\n\n"
                        "state bind\n"
                        "  Show current bindings\n");
 
@@ -55,6 +57,11 @@ Inspector::Inspector(GlDbg &d):
        decoder->gldBreak = gldBreak;
 }
 
+Inspector::~Inspector()
+{
+       gldecoder_delete(decoder);
+}
+
 void Inspector::decode(const char *data, unsigned len)
 {
        if(query_state)
@@ -118,6 +125,28 @@ void Inspector::cmd_state(const string &args)
                const Vector3 &normal = glstate.get_normal();
                printf("  Normal:    [%05.3f, %05.3f, %05.3f]\n", normal.x, normal.y, normal.z);
        }
+       else if(args=="array")
+       {
+               printf("Current vertex arrays:\n");
+               string descr = glstate.get_array(GL_VERTEX_ARRAY).describe();
+               printf("  Vertex:    %s\n", descr.c_str());
+               descr = glstate.get_array(GL_NORMAL_ARRAY).describe();
+               printf("  Normal:    %s\n", descr.c_str());
+               descr = glstate.get_array(GL_COLOR_ARRAY).describe();
+               printf("  Color:     %s\n", descr.c_str());
+               unsigned count = glstate.get_max_texture_units();
+               for(unsigned i=0; i<count; ++i)
+               {
+                       descr = glstate.get_texture_coord_array(i).describe();
+                       printf("  TexCoord%d: %s\n", i, descr.c_str());
+               }
+               count = glstate.get_max_vertex_attribs();
+               for(unsigned i=0; i<count; ++i)
+               {
+                       descr = glstate.get_attrib_array(i).describe();
+                       printf("  Attrib%d:%s %s\n", i, (i>=10 ? " " : "  "), descr.c_str());
+               }
+       }
        else if(args=="bind")
        {
                printf("Current bindings:\n");
@@ -126,10 +155,14 @@ void Inspector::cmd_state(const string &args)
                {
                        printf("  Texture unit %d:\n", i);
                        const TexUnitState &unit = glstate.get_texture_unit(i);
-                       string descr = unit.describe_binding(GL_TEXTURE_2D);
-                       printf("    GL_TEXTURE_2D: %s\n", descr.c_str());
+                       string descr = unit.describe_binding(GL_TEXTURE_1D);
+                       printf("    GL_TEXTURE_1D:       %s\n", descr.c_str());
+                       descr = unit.describe_binding(GL_TEXTURE_2D);
+                       printf("    GL_TEXTURE_2D:       %s\n", descr.c_str());
                        descr = unit.describe_binding(GL_TEXTURE_3D);
-                       printf("    GL_TEXTURE_3D: %s\n", descr.c_str());
+                       printf("    GL_TEXTURE_3D:       %s\n", descr.c_str());
+                       descr = unit.describe_binding(GL_TEXTURE_CUBE_MAP);
+                       printf("    GL_TEXTURE_CUBE_MAP: %s\n", descr.c_str());
                }
                printf("  Buffers:\n");
                const BufferState *buf = glstate.get_current_buffer(GL_ARRAY_BUFFER);
@@ -174,15 +207,33 @@ void Inspector::cmd_texture(const string &args)
                printf("Texture object %d\n", id);
                printf("  Target:          %s\n", describe_enum(tex.target, "TextureTarget"));
                printf("  Images:\n");
-               for(unsigned i=0; i<tex.images.size(); ++i)
+               if(tex.target==GL_TEXTURE_CUBE_MAP)
+               {
+                       static const char *face_labels[6] = { "+X", "-X", "+Y", "-Y", "+Z", "-Z" };
+                       for(unsigned i=0; i<6; ++i)
+                       {
+                               printf("    Face %s:\n", face_labels[i]);
+                               for(unsigned j=i; j<tex.images.size(); j+=6)
+                               {
+                                       string descr = tex.images[j].describe();
+                                       printf("      Level %2d:    %s\n", j/6, descr.c_str());
+                               }
+                       }
+               }
+               else
                {
-                       string descr = tex.images[i].describe();
-                       printf("    Level %2d:      %s\n", i, descr.c_str());
+                       for(unsigned i=0; i<tex.images.size(); ++i)
+                       {
+                               string descr = tex.images[i].describe();
+                               printf("    Level %2d:      %s\n", i, descr.c_str());
+                       }
                }
                printf("  Min. filter:     %s\n", describe_enum(tex.min_filter, "TextureMinFilter"));
                printf("  Mag. filter:     %s\n", describe_enum(tex.mag_filter, "TextureMagFilter"));
-               printf("  Wrap modes:      S=%s / T=%s / R=%s\n", describe_enum(tex.wrap_s, "TextureWrapMode"),
-                       describe_enum(tex.wrap_t, "TextureWrapMode"), describe_enum(tex.wrap_r, "TextureWrapMode"));
+               printf("  Wrap modes:\n");
+               printf("    S:             %s\n", describe_enum(tex.wrap_s, "TextureWrapMode"));
+               printf("    T:             %s\n", describe_enum(tex.wrap_t, "TextureWrapMode"));
+               printf("    R:             %s\n", describe_enum(tex.wrap_r, "TextureWrapMode"));
                printf("  Compare mode:    %s\n", describe_enum(tex.compare_mode, ""));
                printf("  Compare func:    %s\n", describe_enum(tex.compare_func, "DepthFunction"));
                printf("  Generate mipmap: %s\n", (tex.generate_mipmap ? "true" : "false"));