diff --git a/src/gfxstream/.clang-format b/src/gfxstream/.clang-format
new file mode 100644
index 00000000000..dd78747a990
--- /dev/null
+++ b/src/gfxstream/.clang-format
@@ -0,0 +1,15 @@
+# Copyright © 2024 Google
+# SPDX-License-Identifier: MIT
+
+BasedOnStyle: Google
+IndentWidth: 4
+ColumnLimit: 100
+IncludeCategories:
+  - Regex: '^(<(gtest|gmock))'
+    Priority: -1
+FixNamespaceComments: true
+PointerAlignment: Left
+DerivePointerAlignment: false
+
+# Ensure proper formatting of macros such as GOLDFISH_VK_LIST_DISPATCHABLE_HANDLE_TYPES
+StatementMacros: ["f"]