rooty/rpi-vk-driver
1
0
Fork 0
mirror of https://github.com/Yours3lf/rpi-vk-driver.git synced 2025-02-19 16:54:18 +01:00
Code Issues Releases Wiki Activity

fixed dumping

Browse Source
This commit is contained in:
Unknown 2018-08-21 22:13:19 +01:00
parent 2376fa6b00
commit e83674fa83
7 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
brcm/cle/v3d_decoder.c
View File

@ -134,10 +134,10 @@ fail(struct location *loc, const char *msg, ...)
va_list ap;
va_start(ap, msg);
fprintf(stderr, "%s:%d: error: ",
printf("%s:%d: error: ",
loc->filename, loc->line_number);
vfprintf(stderr, msg, ap);
fprintf(stderr, "\n");
vprintf(msg, ap);
printf("\n");
va_end(ap);
exit(EXIT_FAILURE);
}
@ -146,7 +146,7 @@ static void *
fail_on_null(void *p)
{
if (p == NULL) {
fprintf(stderr, "aubinator: out of memory\n");
printf("aubinator: out of memory\n");
exit(EXIT_FAILURE);
}
@ -666,7 +666,7 @@ v3d_spec_load(const struct v3d_device_info *devinfo)
}
if (text_length == 0) {
fprintf(stderr, "unable to find gen (%u) data\n", devinfo->ver);
printf("unable to find gen (%u) data\n", devinfo->ver);
return NULL;
}
@ -675,7 +675,7 @@ v3d_spec_load(const struct v3d_device_info *devinfo)
ctx.devinfo = devinfo;
XML_SetUserData(ctx.parser, &ctx);
if (ctx.parser == NULL) {
fprintf(stderr, "failed to create parser\n");
printf("failed to create parser\n");
return NULL;
}
@ -689,12 +689,16 @@ v3d_spec_load(const struct v3d_device_info *devinfo)
(void **) &text_data);
assert(text_offset + text_length <= total_length);
//test if everything is fine
//FILE* f = fopen("file.xml", "w");
//fwrite(text_data, 1, total_length, f);
//fclose(f);
buf = XML_GetBuffer(ctx.parser, text_length);
memcpy(buf, &text_data[text_offset], text_length);
if (XML_ParseBuffer(ctx.parser, text_length, true) == 0) {
fprintf(stderr,
"Error parsing XML at line %ld col %ld byte %ld/%u: %s\n",
printf("Error parsing XML at line %ld col %ld byte %ld/%u: %s\n",
XML_GetCurrentLineNumber(ctx.parser),
XML_GetCurrentColumnNumber(ctx.parser),
XML_GetCurrentByteIndex(ctx.parser), text_length,
@ -988,10 +992,10 @@ v3d_print_group(struct clif_dump *clif, struct v3d_group *group,
continue;
if (clif->pretty) {
fprintf(clif->out, " %s: %s\n",
printf(" %s: %s\n",
iter.name, iter.value);
} else {
fprintf(clif->out, " /* %30s: */ %s\n",
printf(" /* %30s: */ %s\n",
iter.name, iter.value);
}
if (iter.struct_desc) {

9
brcm/clif/clif_dump.c
View File

@ -38,7 +38,7 @@ clif_dump_add_address_to_worklist(struct clif_dump *clif,
uint32_t addr)
{
struct reloc_worklist_entry *entry =
calloc(1, sizeof(struct reloc_worklist_entry));
rzalloc(clif, struct reloc_worklist_entry);
if (!entry)
return NULL;
@ -54,7 +54,7 @@ struct clif_dump *
clif_dump_init(const struct v3d_device_info *devinfo,
FILE *out, bool pretty)
{
struct clif_dump *clif = calloc(1, sizeof(struct clif_dump));
struct clif_dump *clif = rzalloc(NULL, struct clif_dump);
clif->devinfo = devinfo;
clif->out = out;
@ -282,7 +282,7 @@ clif_dump_buffers(struct clif_dump *clif)
num_relocs++;
}
struct reloc_worklist_entry **relocs =
malloc(sizeof(struct reloc_worklist_entry *) * num_relocs);
ralloc_array(clif, struct reloc_worklist_entry *, num_relocs);
int i = 0;
list_for_each_entry(struct reloc_worklist_entry, reloc,
&clif->worklist, link) {
@ -428,7 +428,8 @@ clif_dump_add_bo(struct clif_dump *clif, const char *name,
{
if (clif->bo_count >= clif->bo_array_size) {
clif->bo_array_size = MAX2(4, clif->bo_array_size * 2);
clif->bo = realloc(clif->bo, sizeof(struct clif_bo) * clif->bo_array_size);
clif->bo = reralloc(clif, clif->bo, struct clif_bo,
clif->bo_array_size);
}
/* CLIF relocs use the buffer name, so make sure they're unique. */

2
brcm/qpu/qpu_disasm.c
View File

@ -353,6 +353,6 @@ v3d_qpu_dump(const struct v3d_device_info *devinfo,
const struct v3d_qpu_instr *instr)
{
const char *decoded = v3d_qpu_decode(devinfo, instr);
fprintf(stderr, "%s", decoded);
printf("%s", decoded);
ralloc_free((char *)decoded);
}

14
driver/driver.c
View File

@ -1494,7 +1494,21 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit(
cmdbuf->submitCl.uniforms = cmdbuf->uniformsCl.buffer;
cmdbuf->submitCl.uniforms_size = clSize(&cmdbuf->uniformsCl);
printf("BCL:\n");
clDump(cmdbuf->submitCl.bin_cl, cmdbuf->submitCl.bin_cl_size);
printf("width height: %u, %u\n", cmdbuf->submitCl.width, cmdbuf->submitCl.height);
printf("tile min/max: %u,%u %u,%u\n", cmdbuf->submitCl.min_x_tile, cmdbuf->submitCl.min_y_tile, cmdbuf->submitCl.max_x_tile, cmdbuf->submitCl.max_y_tile);
printf("color read surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.color_read.hindex, cmdbuf->submitCl.color_read.offset, cmdbuf->submitCl.color_read.bits, cmdbuf->submitCl.color_read.flags);
printf("color write surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.color_write.hindex, cmdbuf->submitCl.color_write.offset, cmdbuf->submitCl.color_write.bits, cmdbuf->submitCl.color_write.flags);
printf("zs read surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.zs_read.hindex, cmdbuf->submitCl.zs_read.offset, cmdbuf->submitCl.zs_read.bits, cmdbuf->submitCl.zs_read.flags);
printf("zs write surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.zs_write.hindex, cmdbuf->submitCl.zs_write.offset, cmdbuf->submitCl.zs_write.bits, cmdbuf->submitCl.zs_write.flags);
printf("msaa color write surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.msaa_color_write.hindex, cmdbuf->submitCl.msaa_color_write.offset, cmdbuf->submitCl.msaa_color_write.bits, cmdbuf->submitCl.msaa_color_write.flags);
printf("msaa zs write surf: hindex, offset, bits, flags %u %u %u %u\n", cmdbuf->submitCl.msaa_zs_write.hindex, cmdbuf->submitCl.msaa_zs_write.offset, cmdbuf->submitCl.msaa_zs_write.bits, cmdbuf->submitCl.msaa_zs_write.flags);
printf("clear color packed rgba %u %u\n", cmdbuf->submitCl.clear_color[0], cmdbuf->submitCl.clear_color[1]);
printf("clear z %u\n", cmdbuf->submitCl.clear_z);
printf("clear s %u\n", cmdbuf->submitCl.clear_s);
printf("flags %u\n", cmdbuf->submitCl.flags);
//submit ioctl
uint64_t lastEmitSequno; //TODO

2
driver/kernelInterface.c
View File

@ -227,7 +227,7 @@ int vc4_bo_wait(int fd, uint32_t bo, uint64_t timeout_ns)
int ret = vc4_bo_wait_ioctl(fd, bo, timeout_ns);
if (ret) {
if (ret != -ETIME) {
fprintf(stderr, "wait failed: %d\n", ret);
printf("wait failed: %d\n", ret);
}
return 0;

2
external/lib/libexpat.so vendored
View File

@ -1 +1 @@
libexpatw.so.1.6.2
libexpat.so.1.6.2

BIN
external/lib/libexpatw.so.1.6.2 → external/lib/libexpat.so.1.6.2 vendored
View File

Binary file not shown.