Add GVR support

CMakeProto.cmake

@@ -49,6 +49,7 @@ protoc_go("github.com/google/gapid/gapis/api/gles" "gapis/api/gles" "resolvables
 
 protoc_go("github.com/google/gapid/gapis/api/gvr/gvr_pb" "gapis/api/gvr/gvr_pb" "api.proto")
 protoc_cc("gapis/api/gvr/gvr_pb" "gapis/api/gvr/gvr_pb" "api.proto")
+protoc_go("github.com/google/gapid/gapis/api/gvr" "gapis/api/gvr" "resolvables.proto")
 
 protoc_go("github.com/google/gapid/gapis/api/vulkan/vulkan_pb" "gapis/api/vulkan/vulkan_pb" "api.proto")
 protoc_cc("gapis/api/vulkan/vulkan_pb" "gapis/api/vulkan/vulkan_pb" "api.proto")

cmd/gapit/trace.go

@@ -54,9 +54,9 @@ func init() {
 
 // These are hard-coded and need to be kept in sync with the api_index
 // in the *.api files.
-const coreAPI = uint32(1 << 0)
 const glesAPI = uint32(1 << 1)
 const vulkanAPI = uint32(1 << 2)
+const gvrAPI = uint32(1 << 3)
 
 func (verb *traceVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 	options := client.Options{
@@ -84,9 +84,10 @@ func (verb *traceVerb) Run(ctx context.Context, flags flag.FlagSet) error {
 
 	switch verb.API {
 	case "vulkan":
-		options.APIs = coreAPI | vulkanAPI
+		options.APIs = vulkanAPI
 	case "gles":
-		options.APIs = coreAPI | glesAPI
+		// TODO: Separate these two out once we can trace Vulkan with OpenGL ES.
+		options.APIs = glesAPI | gvrAPI
 	case "":
 		options.APIs = uint32(0xFFFFFFFF)
 	default:

core/cc/gvr_ptr_types.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef CORE_GVR_PTR_TYPES_H_
+#define CORE_GVR_PTR_TYPES_H_
+
+#include "core/cc/target.h" // STDCALL
+
+#define GVR_API_ATTR
+#define GVR_API_CALL
+#define GVR_API_PTR STDCALL
+
+#endif  // CORE_GVR_PTR_TYPES_H_

core/cc/static_array.h

@@ -21,58 +21,63 @@
 
 namespace core {
 
+template <typename T, int N>
+struct CStaticArray {
+  T mData[N];
+};
+
 // StaticArray represents a fixed size array with implicit conversions to and
 // from T[N].
 template <typename T, int N>
-class StaticArray {
-  typedef T ARRAY_TY[N];
+class StaticArray : protected CStaticArray<T, N> {
 public:
 
   inline StaticArray();
-  inline StaticArray(const StaticArray<T, N>& other);
+  inline StaticArray(const CStaticArray<T, N>& other);
   inline StaticArray(T arr[N]);
   inline StaticArray(std::initializer_list<T> l);
 
   inline operator T*();
   inline operator const T*() const;
-
-private:
-  T mData[N];
 };
 
 template <typename T, int N>
-inline StaticArray<T, N>::StaticArray() : mData{} {}
+inline StaticArray<T, N>::StaticArray() {
+    for (int i = 0; i < N; i++) {
+        this->mData[i] = T();
+    }
+}
 
 template <typename T, int N>
-inline StaticArray<T, N>::StaticArray(const StaticArray<T, N>& other) {
+inline StaticArray<T, N>::StaticArray(const CStaticArray<T, N>& other) {
     for (int i = 0; i < N; i++) {
-        mData[i] = other[i];
+        this->mData[i] = other.mData[i];
     }
 }
 
 template <typename T, int N>
-inline StaticArray<T, N>::StaticArray(T arr[N]) : mData{} {
+inline StaticArray<T, N>::StaticArray(T arr[N]) {
     for (int i = 0; i < N; i++) {
-        mData[i] = arr[i];
+        this->mData[i] = arr[i];
     }
 }
 
 template <typename T, int N>
-inline StaticArray<T, N>::StaticArray(std::initializer_list<T> l) : mData{} {
+inline StaticArray<T, N>::StaticArray(std::initializer_list<T> l) {
     GAPID_ASSERT(l.size() == N);
     for (int i = 0; i < N; i++) {
-        mData[i] = l.begin()[i];
+        this->mData[i] = l.begin()[i];
     }
 }
 
 template <typename T, int N>
 inline StaticArray<T, N>::operator T*() {
-    return &mData[0];
+    return &this->mData[0];
 }
 
 template <typename T, int N>
 inline StaticArray<T, N>::operator const T*() const {
-    return &mData[0];
+    return &this->mData[0];
 }
 
 }  // namespace core

gapii/cc/.gitignore

@@ -5,6 +5,7 @@
 /gles_types.h
 
 /gvr_exports.cpp
+/gvr_exports.h
 /gvr_imports.cpp
 /gvr_imports.h
 /gvr_types.cpp

gapii/cc/CMakeBuild.cmake

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+build_subdirectory(android)
+
 set(api gles/gles.api)
 
 apic(${api} TEMPLATE ${APIC_API_PATH}/gles/templates/api_exports.cpp.tmpl)
@@ -42,8 +44,9 @@ apic(${api} TEMPLATE api_types.h.tmpl)
 
 set(api gvr/gvr.api)
 
-# apic(${api} TEMPLATE ${APIC_API_PATH}/gles/templates/api_exports.cpp.tmpl)
-# apic(${api} TEMPLATE ${APIC_API_PATH}/gles/templates/api_imports.cpp.tmpl)
+apic(${api} TEMPLATE ${APIC_API_PATH}/gvr/templates/api_exports.cpp.tmpl)
+apic(${api} TEMPLATE ${APIC_API_PATH}/gvr/templates/api_exports.h.tmpl)
+apic(${api} TEMPLATE ${APIC_API_PATH}/gvr/templates/api_imports.cpp.tmpl)
 apic(${api} TEMPLATE api_imports.h.tmpl)
 apic(${api} TEMPLATE api_spy.cpp.tmpl)
 apic(${api} TEMPLATE api_spy.h.tmpl)
@@ -71,6 +74,7 @@ list(APPEND sources
     "${PROTO_CC_OUT}/gapis/api/vulkan/vulkan_pb/api.pb.cc"
     "${PROTO_CC_OUT}/gapis/api/gles/gles_pb/api.pb.cc"
     "${PROTO_CC_OUT}/gapis/api/gles/gles_pb/extras.pb.cc"
+    "${PROTO_CC_OUT}/gapis/api/gvr/gvr_pb/api.pb.cc"
 )
 
 foreach(abi ${ANDROID_ACTIVE_ABI_LIST})
@@ -96,6 +100,10 @@ if(NOT DISABLED_CXX)
     target_include_directories(gapii PUBLIC "${PROTO_CC_OUT}")
     target_include_directories(gapii PUBLIC "${CMAKE_SOURCE_DIR}/external/protobuf/src")
 
+    # disable warning: 'foo' has C-linkage specified, but returns user-defined
+    # type 'bar' which is incompatible with C
+    target_compile_options(gapii PRIVATE "-Wno-return-type-c-linkage")
+
     if(APPLE)
         find_package(Cocoa REQUIRED)
         target_link_libraries(gapii Cocoa::Lib)
@@ -107,9 +115,7 @@ if(NOT DISABLED_CXX)
 
         set_target_properties(gapii PROPERTIES
           LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/gapii.exports")
-    elseif(GAPII_TARGET)
-
-    else()
+    elseif(NOT GAPII_TARGET)
         find_package(GL REQUIRED)
         target_link_libraries(gapii GL::Lib)
 

gapii/cc/CMakeFiles.cmake

@@ -41,6 +41,21 @@ set(files
     gles_spy_subroutines_1.cpp
     gles_types.cpp
     gles_types.h
+    gvr_abi_types.h
+    gvr_exports.cpp
+    gvr_extras.inl
+    gvr_imports.cpp
+    gvr_imports.h
+    gvr_inlines.inl
+    gvr_spy.h
+    gvr_spy_0.cpp
+    gvr_spy_1.cpp
+    gvr_spy_2.cpp
+    gvr_spy_3.cpp
+    gvr_spy_subroutines_0.cpp
+    gvr_spy_subroutines_1.cpp
+    gvr_types.cpp
+    gvr_types.h
     pack_encoder.h
     pack_encoder.cpp
     pool.cpp

gapii/cc/android/.gitignore

@@ -0,0 +1 @@
+gvr_install.cpp

gapii/cc/android/CMakeBuild.cmake

@@ -0,0 +1,17 @@
+# Copyright (C) 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(api gvr/gvr.api)
+
+apic(${api} TEMPLATE ${APIC_API_PATH}/gvr/templates/api_install.cpp.tmpl)

gapii/cc/android/CMakeFiles.cmake

@@ -18,6 +18,8 @@
 # build and the file will be recreated, check in the new version.
 
 set(files
+    gvr_install.cpp
+    gvr_install.h
     installer.cpp
     installer.h
 )

gapii/cc/android/gvr_install.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GAPII_ANDROID_GVR_INSTALL_H
+#define GAPII_ANDROID_GVR_INSTALL_H
+
+namespace gapii {
+
+class GvrImports;
+
+// install_gvr installs interceptor hooks into all the GVR functions.
+bool install_gvr(void* gvr_lib, GvrImports* imports);
+
+} // namespace gapii
+
+#endif // GAPII_ANDROID_GVR_INSTALL_H

gapii/cc/connection_header.cpp

@@ -28,7 +28,8 @@ ConnectionHeader::ConnectionHeader()
     , mStartFrame(0)
     , mNumFrames(0)
     , mAPIs(0xFFFFFFFF)
-    , mFlags(0) {}
+    , mFlags(0)
+    , mGvrHandle(0) {}
 
 bool ConnectionHeader::read(core::StreamReader* reader) {
     if (!reader->read(mMagic)) {
@@ -62,7 +63,8 @@ bool ConnectionHeader::read(core::StreamReader* reader) {
         !reader->read(mStartFrame) ||
         !reader->read(mNumFrames) ||
         !reader->read(mAPIs) ||
-        !reader->read(mFlags)) {
+        !reader->read(mFlags) ||
+        !reader->read(mGvrHandle)) {
         return false;
     }
 

gapii/cc/connection_header.h

@@ -46,14 +46,15 @@ class ConnectionHeader {
     // on success or false on error.
     bool read(core::StreamReader* reader);
 
-    uint8_t  mMagic[4];                     // 's', 'p', 'y', '0'
-    uint32_t mVersion;                      // 1
-    uint32_t mObserveFrameFrequency;        // non-zero == enabled.
-    uint32_t mObserveDrawFrequency;         // non-zero == enabled.
-    uint32_t mStartFrame;                   // non-zero == Frame to start at.
-    uint32_t mNumFrames;                    // non-zero == Number of frames to capture.
-    uint32_t mAPIs;                         // Bitset of APIS to enable.
-    uint32_t mFlags;                        // Combination of FLAG_XX bits.
+    uint8_t  mMagic[4];              // 's', 'p', 'y', '0'
+    uint32_t mVersion;               // 1
+    uint32_t mObserveFrameFrequency; // non-zero == enabled.
+    uint32_t mObserveDrawFrequency;  // non-zero == enabled.
+    uint32_t mStartFrame;            // non-zero == Frame to start at.
+    uint32_t mNumFrames;             // non-zero == Number of frames to capture.
+    uint32_t mAPIs;                  // Bitset of APIS to enable.
+    uint32_t mFlags;                 // Combination of FLAG_XX bits.
+    uint64_t mGvrHandle;             // Handle of GVR library.
 };
 
 } // namespace gapii

gapii/cc/gvr_abi_types.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef GAPII_GVR_ABI_TYPES_H
+#define GAPII_GVR_ABI_TYPES_H
+
+namespace gapii {
+
+struct gvr_mat4_abi : core::CStaticArray<float, 16> {};
+
+gvr_mat4f::gvr_mat4f(gvr_mat4_abi const& abi) : mm(abi) {}
+gvr_mat4f::operator gvr_mat4_abi() const {
+    gvr_mat4_abi out;
+    memcpy(&out, this, sizeof(out));
+    return out;
+}
+
+} // namespace gapii
+
+#endif // GAPII_GVR_ABI_TYPES_H

gapii/cc/gvr_extras.inl

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Note this file is included in context in gvr_spy.h:
+//
+// namespace gapii {
+//
+// class GvrSpy {
+// protected: