]> git.tdb.fi Git - gldbg.git/blobdiff - source/commandinterpreter.cpp
Make trace command more straightforward
[gldbg.git] / source / commandinterpreter.cpp
index c51d0a2b223a326ff297be9d37e6fb46df573eae..9660aaa0ec8940487feae23a8c1aa74258d8fd9e 100644 (file)
@@ -12,6 +12,7 @@ Distributed under the GPL
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "commandinterpreter.h"
+#include "enums.h"
 #include "gldbg.h"
 #include "tracer.h"
 
@@ -46,12 +47,35 @@ CommandInterpreter::CommandInterpreter(GlDbg &d):
 
        commands["trace"] = Command(&CommandInterpreter::cmd_trace,
                "Traces GL function calls",
-               "trace >FILE\n"
-               "  Send trace output to FILE.  As a special case, - means stdout.\n\n"
+               "trace\n"
+               "  Send trace output to stdout.\n"
+               "trace FILE\n"
+               "  Send trace output to FILE (- for stdout).\n\n"
                "trace {off|on}\n"
                "  Temporarily suspend or resume trace without closing the file.\n\n"
                "trace end\n"
                "  Terminate trace, closing the file.\n");
+
+       commands["state"] = Command(&CommandInterpreter::cmd_state,
+               "Inspects general GL state",
+               "state vertex\n"
+               "  Print current vertex attributes\n\n"
+               "state bind\n"
+               "  Show current bindings\n");
+
+       commands["texture"] = Command(&CommandInterpreter::cmd_texture,
+               "Inspect texture state",
+               "texture\n"
+               "  Lists texture objects\n\n"
+               "texture ID\n"
+               "  Print information about a texture object\n");
+
+       commands["buffer"] = Command(&CommandInterpreter::cmd_buffer,
+               "Inspect buffer object state",
+               "buffer\n"
+               "  Lists buffer objects\n\n"
+               "buffer ID\n"
+               "  Print information about a buffer object\n");
 }
 
 void CommandInterpreter::execute(const string &cmd)
@@ -100,6 +124,7 @@ void CommandInterpreter::cmd_run(const string &)
 
 void CommandInterpreter::cmd_continue(const string &)
 {
+       IO::print("Continuing.\n");
        gldbg.get_process().resume();
 }
 
@@ -136,37 +161,119 @@ void CommandInterpreter::cmd_exit(const string &)
 void CommandInterpreter::cmd_trace(const string &args)
 {
        Tracer &tracer = gldbg.get_tracer();
-       if(args[0]=='>')
+       if(args.empty() || args=="-")
+       {
+               tracer.set_output(IO::cout);
+               IO::print("Tracing to stdout\n");
+       }
+       else if(args=="on")
        {
-               string fn = args.substr(1);
-               if(fn=="-")
+               tracer.enable();
+               IO::print("Tracing enabled\n");
+       }
+       else if(args=="off")
+       {
+               tracer.disable();
+               IO::print("Tracing disabled\n");
+       }
+       else if(args=="end")
+       {
+               tracer.set_output(0);
+               IO::print("Tracing terminated\n");
+       }
+       else
+       {
+               tracer.set_output(new IO::File(args, IO::M_WRITE));
+               IO::print("Tracing to %s\n", args);
+       }
+}
+
+void CommandInterpreter::cmd_state(const string &args)
+{
+       const GlState &glstate = gldbg.get_glstate();
+       if(args=="vertex")
+       {
+               IO::print("Current vertex attributes:\n");
+               const Vector4 &color = glstate.get_color();
+               IO::print("  Color:     [%05.3f, %05.3f, %05.3f, %05.3f]\n", color.r, color.g, color.b, color.a);
+               for(unsigned i=0; i<8; ++i)
                {
-                       tracer.set_output(IO::cout);
-                       IO::print("Tracing to stdout\n");
+                       const Vector4 &texcoord = glstate.get_texcoord(i);
+                       IO::print("  TexCoord%d: [%05.3f, %05.3f, %05.3f, %05.3f]\n", i, texcoord.s, texcoord.t, texcoord.p, texcoord.q);
                }
-               else
+               const Vector3 &normal = glstate.get_normal();
+               IO::print("  Normal:    [%05.3f, %05.3f, %05.3f]\n", normal.x, normal.y, normal.z);
+       }
+       else if(args=="bind")
+       {
+               IO::print("Current bindings:\n");
+               for(unsigned i=0; i<8; ++i)
                {
-                       tracer.set_output(new IO::File(fn, IO::M_WRITE));
-                       IO::print("Tracing to %s\n", fn);
+                       IO::print("  Texture unit %d:\n", i);
+                       const TexUnitState &unit = glstate.get_texture_unit(i);
+                       IO::print("    GL_TEXTURE_2D: %s\n", unit.describe_binding(GL_TEXTURE_2D));
+                       IO::print("    GL_TEXTURE_3D: %s\n", unit.describe_binding(GL_TEXTURE_3D));
                }
+               IO::print("  Buffers:\n");
+               const BufferState *buf = glstate.get_current_buffer(GL_ARRAY_BUFFER);
+               IO::print("    GL_ARRAY_BUFFER:         %d\n", (buf ? buf->id : 0));
+               buf = glstate.get_current_buffer(GL_ELEMENT_ARRAY_BUFFER);
+               IO::print("    GL_ELEMENT_ARRAY_BUFFER: %d\n", (buf ? buf->id : 0));
        }
        else
+               throw InvalidParameterValue("Invalid or missing argument");
+}
+
+void CommandInterpreter::cmd_texture(const string &args)
+{
+       if(args.empty())
        {
-               if(args=="on")
+               const map<unsigned, TextureState> &textures = gldbg.get_glstate().get_textures();
+               IO::print("%d texture objects:\n", textures.size());
+               for(map<unsigned, TextureState>::const_iterator i = textures.begin(); i!=textures.end(); ++i)
                {
-                       tracer.enable();
-                       IO::print("Tracing enabled\n");
+                       const TextureState &tex = i->second;
+                       IO::print("  %d: %s, %d images\n", i->first, tex.describe(), tex.images.size());
                }
-               else if(args=="off")
-               {
-                       tracer.disable();
-                       IO::print("Tracing disabled\n");
-               }
-               else if(args=="end")
+       }
+       else
+       {
+               unsigned id = lexical_cast<unsigned>(args);
+               const TextureState &tex = gldbg.get_glstate().get_texture(id);
+               IO::print("Texture object %d\n", id);
+               IO::print("  Target:          %s\n", describe_enum(tex.target, "TextureTarget"));
+               IO::print("  Images:\n");
+               for(unsigned i=0; i<tex.images.size(); ++i)
                {
-                       tracer.set_output(0);
-                       IO::print("Tracing terminated\n");
+                       const TexImageState &img = tex.images[i];
+                       IO::print("    Level %2d:      %s\n", i, img.describe());
                }
+               IO::print("  Min. filter:     %s\n", describe_enum(tex.min_filter, "TextureMinFilter"));
+               IO::print("  Mag. filter:     %s\n", describe_enum(tex.mag_filter, "TextureMagFilter"));
+               IO::print("  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"));
+               IO::print("  Compare mode:    %s\n", describe_enum(tex.compare_mode, ""));
+               IO::print("  Compare func:    %s\n", describe_enum(tex.compare_func, "DepthFunction"));
+               IO::print("  Generate mipmap: %s\n", tex.generate_mipmap);
+       }
+}
+
+void CommandInterpreter::cmd_buffer(const string &args)
+{
+       if(args.empty())
+       {
+               const GlState::BufferMap &buffers = gldbg.get_glstate().get_buffers();
+               IO::print("%d buffers:\n", buffers.size());
+               for(GlState::BufferMap::const_iterator i=buffers.begin(); i!=buffers.end(); ++i)
+                       IO::print("  %d: %s\n", i->first, i->second.describe());
+       }
+       else
+       {
+               unsigned id = lexical_cast<unsigned>(args);
+               const BufferState &buf = gldbg.get_glstate().get_buffer(id);
+               IO::print("Buffer %d:\n", id);
+               IO::print("  Size:  %d bytes\n", buf.size);
+               IO::print("  Usage: %s\n", describe_enum(buf.usage, ""));
        }
 }