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 b6456ce7ec1afcfabf52e8b995bb2840cde1e38d..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);
        }
 }
@@ -183,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
@@ -240,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();
@@ -383,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();
@@ -426,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();