broadcom/vc5: Enable CLIF dumping of V3D 4.2.

diff --git a/src/broadcom/Makefile.vc5.am b/src/broadcom/Makefile.vc5.am
index d07f071346c60fc0b5a647f59f9a937bdb46b167..c56cf892287e215963ae55e78bf1eb683a2f9963 100644 (file)
--- a/src/broadcom/Makefile.vc5.am
+++ b/src/broadcom/Makefile.vc5.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES += libbroadcom.la
 noinst_LTLIBRARIES += libbroadcom_v33.la
 noinst_LTLIBRARIES += libbroadcom_v41.la
+noinst_LTLIBRARIES += libbroadcom_v42.la
 
 if USE_VC5_SIMULATOR
 AM_CFLAGS += $(VC5_SIMULATOR_CFLAGS)
@@ -13,6 +14,9 @@ libbroadcom_v33_la_CFLAGS = -DV3D_VERSION=33
 libbroadcom_v41_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
 libbroadcom_v41_la_CFLAGS = -DV3D_VERSION=41
 
+libbroadcom_v42_la_SOURCES = $(BROADCOM_PER_VERSION_SOURCES)
+libbroadcom_v42_la_CFLAGS = -DV3D_VERSION=42
+
 libbroadcom_la_SOURCES = $(BROADCOM_FILES)
 
 check_PROGRAMS += \

diff --git a/src/broadcom/clif/clif_private.h b/src/broadcom/clif/clif_private.h
index eac61eaa95bea2d4eb9947348ba4a747efc7c2b1..87de17697d84e3e1d7c6063c3b1aaf59a56bbed8 100644 (file)
--- a/src/broadcom/clif/clif_private.h
+++ b/src/broadcom/clif/clif_private.h
@@ -77,6 +77,11 @@ bool v3d41_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
 void v3d41_clif_dump_gl_shader_state_record(struct clif_dump *clif,
                                             struct reloc_worklist_entry *reloc,
                                             void *vaddr);
+bool v3d42_clif_dump_packet(struct clif_dump *clif, uint32_t offset,
+                            const uint8_t *cl, uint32_t *size);
+void v3d42_clif_dump_gl_shader_state_record(struct clif_dump *clif,
+                                            struct reloc_worklist_entry *reloc,
+                                            void *vaddr);
 
 static inline void
 out(struct clif_dump *clif, const char *fmt, ...)

diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 787529d2505493adadcea644be0e14c09e55da21..6c8ea6134491477f2769fe50702821adfa6b114f 100644 (file)
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -22,7 +22,7 @@ inc_broadcom = include_directories('.', 'cle')
 
 subdir('cle')
 
-vc5_versions = ['33', '41']
+vc5_versions = ['33', '41', '42']
 
 if with_gallium_vc5
   subdir('compiler')