#include "pipe/p_compiler.h"
#include "util/u_memory.h"
#include "util/u_string.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "tgsi/tgsi_dump.h"
+#include <inttypes.h>
+
#include "u_dump.h"
unsigned len;
va_list ap;
va_start(ap, format);
- len = util_vsnprintf(buf, sizeof(buf), format, ap);
+ len = vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
fwrite(buf, len, 1, stream);
}
util_stream_writef(stream, "%g", value);
}
+void
+util_dump_ns(FILE *f, uint64_t time)
+{
+ uint64_t secs = time / (1000*1000*1000);
+ unsigned usecs = (time % (1000*1000*1000)) / 1000;
+ fprintf(f, "%"PRIu64".%06us", secs, usecs);
+}
+
static void
util_dump_string(FILE *stream, const char *str)
{
}
static void
-util_dump_elem_begin(FILE *stream)
+util_dump_elem_begin(UNUSED FILE *stream)
{
}
}
static void
-util_dump_struct_begin(FILE *stream, const char *name)
+util_dump_struct_begin(FILE *stream, UNUSED const char *name)
{
fputs("{", stream);
}
fputs("NULL", stream);
}
-static void
+void
util_dump_ptr(FILE *stream, const void *value)
{
if(value)
- util_stream_writef(stream, "0x%08lx", (unsigned long)(uintptr_t)value);
+ util_stream_writef(stream, "%p", value);
else
util_dump_null(stream);
}
static void
util_dump_enum_blend_factor(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_blend_factor(value, TRUE));
+ util_dump_enum(stream, util_str_blend_factor(value, TRUE));
}
static void
util_dump_enum_blend_func(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_blend_func(value, TRUE));
+ util_dump_enum(stream, util_str_blend_func(value, TRUE));
}
static void
util_dump_enum_func(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_func(value, TRUE));
+ util_dump_enum(stream, util_str_func(value, TRUE));
}
static void
util_dump_enum_prim_mode(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_prim_mode(value, TRUE));
+ util_dump_enum(stream, util_str_prim_mode(value, TRUE));
}
static void
util_dump_enum_tex_target(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_tex_target(value, TRUE));
+ util_dump_enum(stream, util_str_tex_target(value, TRUE));
}
static void
util_dump_enum_tex_filter(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_tex_filter(value, TRUE));
+ util_dump_enum(stream, util_str_tex_filter(value, TRUE));
}
static void
util_dump_enum_tex_mipfilter(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_tex_mipfilter(value, TRUE));
+ util_dump_enum(stream, util_str_tex_mipfilter(value, TRUE));
}
static void
util_dump_enum_tex_wrap(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_tex_wrap(value, TRUE));
+ util_dump_enum(stream, util_str_tex_wrap(value, TRUE));
}
static void
util_dump_enum_stencil_op(FILE *stream, unsigned value)
{
- util_dump_enum(stream, util_dump_stencil_op(value, TRUE));
+ util_dump_enum(stream, util_str_stencil_op(value, TRUE));
}
util_dump_member(stream, uint, state, last_level);
util_dump_member(stream, uint, state, nr_samples);
+ util_dump_member(stream, uint, state, nr_storage_samples);
util_dump_member(stream, uint, state, usage);
util_dump_member(stream, uint, state, bind);
util_dump_member(stream, uint, state, flags);
util_dump_member(stream, bool, state, half_pixel_center);
util_dump_member(stream, bool, state, bottom_edge_rule);
util_dump_member(stream, bool, state, rasterizer_discard);
- util_dump_member(stream, bool, state, depth_clip);
+ util_dump_member(stream, bool, state, depth_clip_near);
+ util_dump_member(stream, bool, state, depth_clip_far);
util_dump_member(stream, bool, state, clip_halfz);
util_dump_member(stream, uint, state, clip_plane_enable);
util_dump_struct_begin(stream, "pipe_shader_state");
- util_dump_member_begin(stream, "tokens");
- fprintf(stream, "\"\n");
- tgsi_dump_to_file(state->tokens, 0, stream);
- fprintf(stream, "\"");
- util_dump_member_end(stream);
+ if (state->type == PIPE_SHADER_IR_TGSI) {
+ util_dump_member_begin(stream, "tokens");
+ fprintf(stream, "\"\n");
+ tgsi_dump_to_file(state->tokens, 0, stream);
+ fprintf(stream, "\"");
+ util_dump_member_end(stream);
+ }
if (state->stream_output.num_outputs) {
util_dump_member_begin(stream, "stream_output");
else {
util_dump_member(stream, uint, state, u.tex.first_layer);
util_dump_member(stream, uint, state, u.tex.last_layer);
- util_dump_member(stream, uint, state, u.tex.last_level);
+ util_dump_member(stream, uint, state, u.tex.first_level);
util_dump_member(stream, uint, state, u.tex.last_level);
}
util_dump_member(stream, ptr, state, resource);
util_dump_member(stream, uint, state, level);
- util_dump_member(stream, uint, state, usage);
+ util_dump_member(stream, transfer_usage, state, usage);
util_dump_member_begin(stream, "box");
util_dump_box(stream, &state->box);
util_dump_member_end(stream);
}
-void
-util_dump_index_buffer(FILE *stream, const struct pipe_index_buffer *state)
-{
- if (!state) {
- util_dump_null(stream);
- return;
- }
-
- util_dump_struct_begin(stream, "pipe_index_buffer");
-
- util_dump_member(stream, uint, state, index_size);
- util_dump_member(stream, uint, state, offset);
- util_dump_member(stream, ptr, state, buffer);
- util_dump_member(stream, ptr, state, user_buffer);
-
- util_dump_struct_end(stream);
-}
-
-
void
util_dump_vertex_buffer(FILE *stream, const struct pipe_vertex_buffer *state)
{
util_dump_struct_begin(stream, "pipe_vertex_buffer");
util_dump_member(stream, uint, state, stride);
+ util_dump_member(stream, bool, state, is_user_buffer);
util_dump_member(stream, uint, state, buffer_offset);
- util_dump_member(stream, ptr, state, buffer);
- util_dump_member(stream, ptr, state, user_buffer);
+ util_dump_member(stream, ptr, state, buffer.resource);
util_dump_struct_end(stream);
}
util_dump_struct_begin(stream, "pipe_draw_info");
- util_dump_member(stream, bool, state, indexed);
+ util_dump_member(stream, uint, state, index_size);
+ util_dump_member(stream, uint, state, has_user_indices);
util_dump_member(stream, enum_prim_mode, state, mode);
util_dump_member(stream, uint, state, start);
util_dump_member(stream, uint, state, start_instance);
util_dump_member(stream, uint, state, instance_count);
+ util_dump_member(stream, uint, state, drawid);
+
util_dump_member(stream, uint, state, vertices_per_patch);
util_dump_member(stream, int, state, index_bias);
util_dump_member(stream, uint, state, max_index);
util_dump_member(stream, bool, state, primitive_restart);
- util_dump_member(stream, uint, state, restart_index);
-
+ if (state->primitive_restart)
+ util_dump_member(stream, uint, state, restart_index);
+
+ if (state->index_size) {
+ if (state->has_user_indices)
+ util_dump_member(stream, ptr, state, index.user);
+ else
+ util_dump_member(stream, ptr, state, index.resource);
+ }
util_dump_member(stream, ptr, state, count_from_stream_output);
+ if (!state->indirect) {
+ util_dump_member(stream, ptr, state, indirect);
+ } else {
+ util_dump_member(stream, uint, state, indirect->offset);
+ util_dump_member(stream, uint, state, indirect->stride);
+ util_dump_member(stream, uint, state, indirect->draw_count);
+ util_dump_member(stream, uint, state, indirect->indirect_draw_count_offset);
+ util_dump_member(stream, ptr, state, indirect->buffer);
+ util_dump_member(stream, ptr, state, indirect->indirect_draw_count);
+ }
+
+ util_dump_struct_end(stream);
+}
+
+void util_dump_grid_info(FILE *stream, const struct pipe_grid_info *state)
+{
+ if (!state) {
+ util_dump_null(stream);
+ return;
+ }
+
+ util_dump_struct_begin(stream, "pipe_grid_info");
+
+ util_dump_member(stream, uint, state, pc);
+ util_dump_member(stream, ptr, state, input);
+ util_dump_member(stream, uint, state, work_dim);
+
+ util_dump_member_begin(stream, "block");
+ util_dump_array(stream, uint, state->block, ARRAY_SIZE(state->block));
+ util_dump_member_end(stream);
+
+ util_dump_member_begin(stream, "grid");
+ util_dump_array(stream, uint, state->grid, ARRAY_SIZE(state->grid));
+ util_dump_member_end(stream);
+
util_dump_member(stream, ptr, state, indirect);
util_dump_member(stream, uint, state, indirect_offset);