X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=flavors%2Fgl%2Fsource%2Finspector.cpp;h=5db0d3d4b1b6971532c8e1528ab06cd31bdb2a3d;hb=HEAD;hp=f7d90f846802c72f97e63b1b6198d53127b70fd9;hpb=90368e53a94c6fa68cb678a1a03a9da7bf0c7dd8;p=gldbg.git

diff --git a/flavors/gl/source/inspector.cpp b/flavors/gl/source/inspector.cpp
index f7d90f8..5db0d3d 100644
--- a/flavors/gl/source/inspector.cpp
+++ b/flavors/gl/source/inspector.cpp
@@ -1,21 +1,28 @@
 #include <stdexcept>
 #include <cstdio>
 #include <cstdlib>
+#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");
 
@@ -46,13 +53,46 @@ Inspector::Inspector(GlDbg &dbg)
 			"  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.clear_breakpoint(FUNC_GLXMAKECURRENT, BREAK_RETURN, this);
+		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<Inspector *>(user_data)->query_state;
+}
+
 void Inspector::print_indented(const string &str, unsigned indent)
 {
 	string spaces(indent, ' ');
@@ -77,7 +117,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<count; ++i)
 		{
 			const Vector4 &texcoord = glstate.get_texcoord(i);
 			printf("  TexCoord%d: [%05.3f, %05.3f, %05.3f, %05.3f]\n", i, texcoord.s, texcoord.t, texcoord.p, texcoord.q);
@@ -85,17 +126,44 @@ 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");
-		for(unsigned i=0; i<8; ++i)
+		unsigned count = glstate.get_max_texture_units();
+		for(unsigned i=0; i<count; ++i)
 		{
 			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);
@@ -104,7 +172,8 @@ void Inspector::cmd_state(const string &args)
 		printf("    GL_ELEMENT_ARRAY_BUFFER: %d\n", (buf ? buf->id : 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; i<count; ++i)
 		{
 			const BufferBindingState &binding = glstate.get_buffer_binding(GL_UNIFORM_BUFFER, i);
 			if(binding.buffer)
@@ -120,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
@@ -139,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)
 		{
-			string descr = tex.images[i].describe();
-			printf("    Level %2d:      %s\n", i, descr.c_str());
+			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
+		{
+			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"));
@@ -159,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();
@@ -302,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();
@@ -345,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();