X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=flavors%2Fgl%2Fsource%2Finspector.cpp;h=6ff3f7033fa86180b2317f85f2e2d6a443f5800b;hb=a34325fadec5b2be003bf9af1f081bfc4c83e8b6;hp=150457eb8a87ff4750d1f3be6243242c3ac4ec35;hpb=73d29911044cfffdc7edad50aeb2a8d1175ecd11;p=gldbg.git diff --git a/flavors/gl/source/inspector.cpp b/flavors/gl/source/inspector.cpp index 150457e..6ff3f70 100644 --- a/flavors/gl/source/inspector.cpp +++ b/flavors/gl/source/inspector.cpp @@ -1,21 +1,28 @@ #include #include #include +#include "breakpoint.h" #include "enums.h" +#include "functions.h" #include "gldbg.h" #include "inspector.h" #include "strformat.h" using namespace std; -Inspector::Inspector(GlDbg &dbg) +Inspector::Inspector(GlDbg &d): + gldbg(d), + decoder(gldecoder_new(this, NULL)), + query_state(0) { - CommandInterpreter &cmd_interp = dbg.get_command_interpreter(); + CommandInterpreter &cmd_interp = gldbg.get_command_interpreter(); cmd_interp.register_command("state", this, &Inspector::cmd_state) .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"); @@ -32,13 +39,75 @@ Inspector::Inspector(GlDbg &dbg) " Lists buffer objects\n\n" "buffer ID\n" " Print information about a buffer object\n"); + + cmd_interp.register_command("shader", this, &Inspector::cmd_shader) + .set_help("Inspect shader object state", + "shader\n" + " List shader objects\n\n" + "shader ID\n" + " Print information about a shader object\n"); + + cmd_interp.register_command("program", this, &Inspector::cmd_program) + .set_help("Inspect program object state", + "program\n" + " List program objects\n\n" + "program ID\n" + " Print information about a program object\n"); + + decoder->gldBreak = gldBreak; +} + +Inspector::~Inspector() +{ + gldecoder_delete(decoder); } void Inspector::decode(const char *data, unsigned len) { + if(query_state) + gldecoder_decode(decoder, data, len); state.decode(data, len); } +void Inspector::process_started() +{ + gldbg.set_breakpoint(FUNC_GLXMAKECURRENT, BREAK_RETURN, this); + query_state = 1; +} + +void Inspector::process_stopped(int reason) +{ + if((reason>>8)==3 && query_state==2) + { + GlPacket *pkt = packet_begin(FUNC_GLDQUERYLIMITS); + gldbg.send(pkt); + query_state = 0; + gldbg.resume_from_break(this); + } +} + +void Inspector::gldBreak(void *user_data, unsigned short func, unsigned char flag) +{ + if(func==FUNC_GLXMAKECURRENT && flag==BREAK_RETURN) + ++reinterpret_cast(user_data)->query_state; +} + +void Inspector::print_indented(const string &str, unsigned indent) +{ + string spaces(indent, ' '); + string::size_type start = 0; + while(1) + { + string::size_type newline = str.find('\n', start); + string line = str.substr(start, newline-start); + if(newline!=string::npos || !line.empty()) + printf("%s%s\n", spaces.c_str(), line.c_str()); + if(newline==string::npos) + break; + start = newline+1; + } +} + void Inspector::cmd_state(const string &args) { const GlState &glstate = state; @@ -47,7 +116,8 @@ void Inspector::cmd_state(const string &args) printf("Current vertex attributes:\n"); const Vector4 &color = glstate.get_color(); printf(" 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) + unsigned count = glstate.get_max_texture_units(); + for(unsigned i=0; i=10 ? " " : " "), descr.c_str()); + } + } else if(args=="bind") { printf("Current bindings:\n"); - for(unsigned i=0; i<8; ++i) + unsigned count = glstate.get_max_texture_units(); + for(unsigned i=0; iid : 0)); buf = glstate.get_current_buffer(GL_UNIFORM_BUFFER); printf(" GL_UNIFORM_BUFFER: %d\n", (buf ? buf->id : 0)); - for(unsigned i=0; i<64; ++i) + count = glstate.get_max_uniform_buffer_bindings(); + for(unsigned i=0; isecond.describe(); + printf(" %d: %s\n", i->first, descr.c_str()); + } + } + else + { + char *end = 0; + unsigned id = strtoul(args.c_str(), &end, 0); + if(end && *end) + throw runtime_error("Invalid shader id"); + + const ShaderState &shader = state.get_shader(id); + printf("Shader %d:\n", shader.id); + printf(" Type: %s\n", describe_enum(shader.type, "")); + unsigned n = 0; + for(vector::const_iterator i=shader.source.begin(); i!=shader.source.end(); ++i, ++n) + { + printf(" Source string %d:\n", n); + print_indented(*i, 4); + } + if(shader.source_changed) + printf(" Source changed since last compile\n"); + printf(" Compile status: %d\n", shader.compile_status); + if(shader.info_log.empty()) + printf(" Info log is empty\n"); + else + { + printf(" Info log:\n"); + print_indented(shader.info_log, 4); + } + if(shader.pending_delete) + printf(" Pending deletion\n"); + } +} + +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()); + for(GlState::ProgramMap::const_iterator i=programs.begin(); i!=programs.end(); ++i) + { + string descr = i->second.describe(); + printf(" %d: %s\n", i->first, descr.c_str()); + } + } + else + { + char *end = 0; + unsigned id = strtoul(args.c_str(), &end, 0); + if(end && *end) + throw runtime_error("Invalid program id"); + + const ProgramState &program = state.get_program(id); + printf("Program %d:\n", program.id); + printf(" Attached shaders:\n"); + for(vector::const_iterator i=program.shaders.begin(); i!=program.shaders.end(); ++i) + { + string descr = (*i)->describe(); + printf(" %d: %s\n", (*i)->id, descr.c_str()); + } + if(program.shaders_changed) + printf(" Shaders changed since last compile\n"); + printf(" Link status: %d\n", program.link_status); + if(program.info_log.empty()) + printf(" Info log is empty\n"); + else + { + printf(" Info log:\n"); + print_indented(program.info_log, 4); + } + } +}