Subtree squashed (#144)

* Squashed 'third_party/gfxreconstruct/' content from commit a85342ef

git-subtree-dir: third_party/gfxreconstruct
git-subtree-split: a85342efd83cb29365fb3763f8c15882095986d8

* Adds gfxreconstruct to dive

.gitmodules

@@ -20,3 +20,12 @@
 [submodule "third_party/perfetto"]
 	path = third_party/perfetto
 	url = https://android.googlesource.com/platform/external/perfetto
+[submodule "third_party/gfxreconstruct/external/SPIRV-Headers"]
+	path = third_party/gfxreconstruct/external/SPIRV-Headers
+	url = https://github.com/KhronosGroup/SPIRV-Headers.git
+[submodule "third_party/gfxreconstruct/external/SPIRV-Reflect"]
+	path = third_party/gfxreconstruct/external/SPIRV-Reflect
+	url = https://github.com/KhronosGroup/SPIRV-Reflect.git
+[submodule "third_party/gfxreconstruct/external/Vulkan-Headers"]
+	path = third_party/gfxreconstruct/external/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git

CMakeLists.txt

@@ -101,6 +101,33 @@ if(NOT ANDROID)
     if (EXISTS "${CMAKE_SOURCE_DIR}/ui/CMakeLists.txt" AND NOT DIVE_NO_DISASSEMBLY)
         add_subdirectory(ui)
     endif()
+
+    add_subdirectory(third_party/gfxreconstruct)
+else()
+
+    execute_process(
+        COMMAND ./gradlew assembleDebug
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android
+    )
+
+    execute_process(
+        COMMAND ./gradlew assembleRelease
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android
+    )
+
+    file(ARCHIVE_EXTRACT
+    INPUT "${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android/layer/build/outputs/aar/layer-debug.aar"
+    DESTINATION "${CMAKE_SOURCE_DIR}/build_android/Debug/third_party/gfxreconstruct/android/layer"
+    )
+
+    file(ARCHIVE_EXTRACT
+    INPUT "${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android/layer/build/outputs/aar/layer-release.aar"
+    DESTINATION "${CMAKE_SOURCE_DIR}/build_android/Release/third_party/gfxreconstruct/android/layer"
+    )
+
+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android/tools/replay/build/outputs/apk/debug DESTINATION ${CMAKE_SOURCE_DIR}/build_android/Debug/third_party/gfxreconstruct/android/tools/replay/build/outputs/apk/debug)
+
+    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/gfxreconstruct/android/tools/replay/build/outputs/apk/release DESTINATION ${CMAKE_SOURCE_DIR}/build_android/Release/third_party/gfxreconstruct/android/tools/replay/build/outputs/apk/release)
 endif()
 
 option(DIVE_UNIT_TESTS, "Build unit tests for dive")

third_party/freedreno/wrap/wrap-syscall.c

@@ -1337,7 +1337,8 @@ static void kgsl_ioclt_gpuobj_import_pre(int fd,
 		struct kgsl_gpuobj_import *param)
 {
 	if (param->type == KGSL_USER_MEM_TYPE_DMABUF) {
-		struct kgsl_gpuobj_import_dma_buf *import_dmabuf = param->priv;
+		struct kgsl_gpuobj_import_dma_buf *import_dmabuf;
+		import_dmabuf->fd = param->priv;
 
 		printf("\t\tdmabuf_fd:\t%u\n", import_dmabuf->fd);
 	}

third_party/gfxreconstruct/.clang-format

@@ -0,0 +1,44 @@
+---
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: true
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterExternBlock: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakConstructorInitializers: AfterColon
+# Not supported in 6
+#BreakInheritanceList: BeforeColon
+Cpp11BracedListStyle: false
+ColumnLimit: 120
+IndentCaseLabels: true
+IndentWidth: 4
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeParens: ControlStatements
+...

third_party/gfxreconstruct/.github/ISSUE_TEMPLATE/capture-failure.md

@@ -0,0 +1,36 @@
+---
+name: Capture failure
+about: Create a capture bug report to help us improve
+title: "[capture] Give one-line summary of issue here"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the capture bug:**
+Describe the issue here.  Is it visual corruption?  A hang?  A performance problem?
+
+**Build Environment:**
+Please include the SHA and PR or branch name used in capture
+
+**Capture Settings:**
+Include any GFXRECON_... environment variables.
+
+**To Reproduce:**
+Provide any steps here to reproduce the behavior beyond starting the program.
+
+**Screenshots:**
+If applicable, add screenshots to illustrate visual corruption.
+
+**System environment:**
+ - GPU and driver version on which capture was taken
+
+**Title configuration:**
+  - Title name
+  - Title version
+  - Steam ID if applicable
+  - Is DXR enabled?
+
+**Additional information (optional):**
+  - is there a SHA for which capture is known to work?  (indicates possible regression in encoder)
+  - Does capture operate correctly on a different GPU or driver version?

third_party/gfxreconstruct/.github/ISSUE_TEMPLATE/replay-failure.md

@@ -0,0 +1,43 @@
+---
+name: Replay failure
+about: Create a replay bug report to help us improve.
+title: "[replay] Give one-line summary of issue here"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the replay bug:**
+Describe the issue here.  Is it visual corruption?  A hang?  A performance problem?
+
+**Verify before submission:**
+* Was trimming enabled?
+* Was replayer renamed if necessary?
+* Was --sync used if title is known to need forced synchronization?
+
+**Build Environment:**
+Please include the SHA and PR or branch name used in capture and also used to build the replayer.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Get the `.gfxr` file from [insert download location here, e.g. LunarShare]
+2. Run gfxrecon-replay with [insert parameters here]
+
+**Screenshots:**
+If applicable, add screenshots to illustrate visual corruption.
+
+**System environment:**
+ - GPU and driver version on which capture was taken
+ - GPU and driver version on which capture file was replayed with issue
+
+**Title configuration:**
+  - Title name
+  - Title version
+  - Steam ID if applicable
+  - Is DXR enabled?
+
+**Additional information (optional):**
+  - is there a SHA for which replayer is known to replay correctly?  (indicates possible regression in decoder/consumer)
+  - Is there an older trace that works?  What SHA was used to build those capture DLLs?  (indicates possible regression in capture/encoder)
+  - Does a newer capture work?  (indicates bug fix in capture/encoder that needs to be noted)
+  - Does the capture file replay correctly on a different GPU?