Fix things for 64-bit systems

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

diff --git a/flavors/gl/source/inspector.cpp b/flavors/gl/source/inspector.cpp
index de8031b2f22931d429c27ac1dbd45fd922050352..5db0d3d4b1b6971532c8e1528ab06cd31bdb2a3d 100644 (file)
--- a/flavors/gl/source/inspector.cpp
+++ b/flavors/gl/source/inspector.cpp
@@ -57,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)
@@ -77,6 +82,7 @@ void Inspector::process_stopped(int reason)
                GlPacket *pkt = packet_begin(FUNC_GLDQUERYLIMITS);
                gldbg.send(pkt);
                query_state = 0;
+               gldbg.clear_breakpoint(FUNC_GLXMAKECURRENT, BREAK_RETURN, this);
                gldbg.resume_from_break(this);
        }
 }
@@ -150,10 +156,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);
@@ -179,12 +189,12 @@ void Inspector::cmd_texture(const string &args)
        if(args.empty())
        {
                const map<unsigned, TextureState> &textures = state.get_textures();
-               printf("%d texture objects:\n", textures.size());
+               printf("%lu texture objects:\n", textures.size());
                for(map<unsigned, TextureState>::const_iterator i = textures.begin(); i!=textures.end(); ++i)
                {
                        const TextureState &tex = i->second;
                        string descr = tex.describe();
-                       printf("  %d: %s, %d images\n", i->first, descr.c_str(), tex.images.size());
+                       printf("  %d: %s, %lu images\n", i->first, descr.c_str(), tex.images.size());
                }
        }
        else
@@ -198,15 +208,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"));
@@ -218,7 +246,7 @@ void Inspector::cmd_buffer(const string &args)
        if(args.empty())
        {
                const GlState::BufferMap &buffers = state.get_buffers();
-               printf("%d buffers:\n", buffers.size());
+               printf("%lu buffers:\n", buffers.size());
                for(GlState::BufferMap::const_iterator i=buffers.begin(); i!=buffers.end(); ++i)
                {
                        string descr = i->second.describe();
@@ -361,7 +389,7 @@ void Inspector::cmd_shader(const string &args)
        if(args.empty())
        {
                const GlState::ShaderMap &shaders = state.get_shaders();
-               printf("%d shader objects:\n", shaders.size());
+               printf("%lu shader objects:\n", shaders.size());
                for(GlState::ShaderMap::const_iterator i=shaders.begin(); i!=shaders.end(); ++i)
                {
                        string descr = i->second.describe();
@@ -404,7 +432,7 @@ void Inspector::cmd_program(const std::string &args)
        if(args.empty())
        {
                const GlState::ProgramMap &programs = state.get_programs();
-               printf("%d program objects:\n", programs.size());
+               printf("%lu program objects:\n", programs.size());
                for(GlState::ProgramMap::const_iterator i=programs.begin(); i!=programs.end(); ++i)
                {
                        string descr = i->second.describe();