Move render-utils, gldispatch into include directory.
Bug: 237805597
Test: presubmit
Change-Id: I0601498502f26bfb43c0939ff7e0acdde4c0fad5
diff --git a/Android.bp b/Android.bp
index 14a1787..dd9324f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,9 +48,7 @@
".",
"include",
"base/include",
- "gldispatch/include",
"host-common/include",
- "render-utils/include",
"snapshot",
"stream-servers",
"stream-servers/vulkan",
diff --git a/host-common/CMakeLists.txt b/host-common/CMakeLists.txt
index 0737db5..a7a66b9 100644
--- a/host-common/CMakeLists.txt
+++ b/host-common/CMakeLists.txt
@@ -36,7 +36,7 @@
gfxstream-host-common.headers
INTERFACE
include
- ${GFXSTREAM_REPO_ROOT}/render-utils/include)
+ ${GFXSTREAM_REPO_ROOT}/include)
if (BUILD_STANDALONE)
add_library(
@@ -100,7 +100,6 @@
include/host-common/opengl
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
- ${GFXSTREAM_REPO_ROOT}/gldispatch/include
${GFXSTREAM_REPO_ROOT}/stream-servers)
target_link_libraries(
gfxstream-host-common
diff --git a/gldispatch/include/OpenGLESDispatch/DispatchTables.h b/include/OpenGLESDispatch/DispatchTables.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/DispatchTables.h
rename to include/OpenGLESDispatch/DispatchTables.h
diff --git a/gldispatch/include/OpenGLESDispatch/EGLDispatch.h b/include/OpenGLESDispatch/EGLDispatch.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/EGLDispatch.h
rename to include/OpenGLESDispatch/EGLDispatch.h
diff --git a/gldispatch/include/OpenGLESDispatch/GLESv1Dispatch.h b/include/OpenGLESDispatch/GLESv1Dispatch.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/GLESv1Dispatch.h
rename to include/OpenGLESDispatch/GLESv1Dispatch.h
diff --git a/gldispatch/include/OpenGLESDispatch/GLESv2Dispatch.h b/include/OpenGLESDispatch/GLESv2Dispatch.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/GLESv2Dispatch.h
rename to include/OpenGLESDispatch/GLESv2Dispatch.h
diff --git a/gldispatch/include/OpenGLESDispatch/OpenGLDispatchLoader.h b/include/OpenGLESDispatch/OpenGLDispatchLoader.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/OpenGLDispatchLoader.h
rename to include/OpenGLESDispatch/OpenGLDispatchLoader.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_extensions_functions.h b/include/OpenGLESDispatch/RenderEGL_extensions_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_extensions_functions.h
rename to include/OpenGLESDispatch/RenderEGL_extensions_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_extensions_static_translator_namespaced_header.h b/include/OpenGLESDispatch/RenderEGL_extensions_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_extensions_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/RenderEGL_extensions_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_functions.h b/include/OpenGLESDispatch/RenderEGL_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_functions.h
rename to include/OpenGLESDispatch/RenderEGL_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_snapshot_functions.h b/include/OpenGLESDispatch/RenderEGL_snapshot_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_snapshot_functions.h
rename to include/OpenGLESDispatch/RenderEGL_snapshot_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_snapshot_static_translator_namespaced_header.h b/include/OpenGLESDispatch/RenderEGL_snapshot_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_snapshot_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/RenderEGL_snapshot_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/RenderEGL_static_translator_namespaced_header.h b/include/OpenGLESDispatch/RenderEGL_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/RenderEGL_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/RenderEGL_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/StaticDispatch.h b/include/OpenGLESDispatch/StaticDispatch.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/StaticDispatch.h
rename to include/OpenGLESDispatch/StaticDispatch.h
diff --git a/gldispatch/include/OpenGLESDispatch/gldefs.h b/include/OpenGLESDispatch/gldefs.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gldefs.h
rename to include/OpenGLESDispatch/gldefs.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles12tr.h b/include/OpenGLESDispatch/gles12tr.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles12tr.h
rename to include/OpenGLESDispatch/gles12tr.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles12tr_internal.h b/include/OpenGLESDispatch/gles12tr_internal.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles12tr_internal.h
rename to include/OpenGLESDispatch/gles12tr_internal.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles1_extensions_functions.h b/include/OpenGLESDispatch/gles1_extensions_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles1_extensions_functions.h
rename to include/OpenGLESDispatch/gles1_extensions_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles1_extensions_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles1_extensions_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles1_extensions_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles1_extensions_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles1_only_functions.h b/include/OpenGLESDispatch/gles1_only_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles1_only_functions.h
rename to include/OpenGLESDispatch/gles1_only_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles1_only_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles1_only_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles1_only_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles1_only_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles2_extensions_functions.h b/include/OpenGLESDispatch/gles2_extensions_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles2_extensions_functions.h
rename to include/OpenGLESDispatch/gles2_extensions_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles2_extensions_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles2_extensions_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles2_extensions_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles2_extensions_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles2_only_functions.h b/include/OpenGLESDispatch/gles2_only_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles2_only_functions.h
rename to include/OpenGLESDispatch/gles2_only_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles2_only_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles2_only_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles2_only_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles2_only_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles31_only_functions.h b/include/OpenGLESDispatch/gles31_only_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles31_only_functions.h
rename to include/OpenGLESDispatch/gles31_only_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles31_only_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles31_only_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles31_only_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles31_only_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles32_only_functions.h b/include/OpenGLESDispatch/gles32_only_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles32_only_functions.h
rename to include/OpenGLESDispatch/gles32_only_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles32_only_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles32_only_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles32_only_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles32_only_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles3_extensions_functions.h b/include/OpenGLESDispatch/gles3_extensions_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles3_extensions_functions.h
rename to include/OpenGLESDispatch/gles3_extensions_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles3_extensions_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles3_extensions_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles3_extensions_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles3_extensions_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles3_only_functions.h b/include/OpenGLESDispatch/gles3_only_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles3_only_functions.h
rename to include/OpenGLESDispatch/gles3_only_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles3_only_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles3_only_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles3_only_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles3_only_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_common_for_gles1_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles_common_for_gles1_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_common_for_gles1_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles_common_for_gles1_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_common_for_gles2_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles_common_for_gles2_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_common_for_gles2_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles_common_for_gles2_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_common_functions.h b/include/OpenGLESDispatch/gles_common_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_common_functions.h
rename to include/OpenGLESDispatch/gles_common_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_extensions_for_gles1_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles_extensions_for_gles1_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_extensions_for_gles1_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles_extensions_for_gles1_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_extensions_for_gles2_static_translator_namespaced_header.h b/include/OpenGLESDispatch/gles_extensions_for_gles2_static_translator_namespaced_header.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_extensions_for_gles2_static_translator_namespaced_header.h
rename to include/OpenGLESDispatch/gles_extensions_for_gles2_static_translator_namespaced_header.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_extensions_functions.h b/include/OpenGLESDispatch/gles_extensions_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_extensions_functions.h
rename to include/OpenGLESDispatch/gles_extensions_functions.h
diff --git a/gldispatch/include/OpenGLESDispatch/gles_functions.h b/include/OpenGLESDispatch/gles_functions.h
similarity index 100%
rename from gldispatch/include/OpenGLESDispatch/gles_functions.h
rename to include/OpenGLESDispatch/gles_functions.h
diff --git a/render-utils/include/render-utils/RenderChannel.h b/include/render-utils/RenderChannel.h
similarity index 100%
rename from render-utils/include/render-utils/RenderChannel.h
rename to include/render-utils/RenderChannel.h
diff --git a/render-utils/include/render-utils/RenderLib.h b/include/render-utils/RenderLib.h
similarity index 100%
rename from render-utils/include/render-utils/RenderLib.h
rename to include/render-utils/RenderLib.h
diff --git a/render-utils/include/render-utils/Renderer.h b/include/render-utils/Renderer.h
similarity index 100%
rename from render-utils/include/render-utils/Renderer.h
rename to include/render-utils/Renderer.h
diff --git a/render-utils/include/render-utils/render_api_functions.h b/include/render-utils/render_api_functions.h
similarity index 100%
rename from render-utils/include/render-utils/render_api_functions.h
rename to include/render-utils/render_api_functions.h
diff --git a/render-utils/include/render-utils/render_api_platform_types.h b/include/render-utils/render_api_platform_types.h
similarity index 100%
rename from render-utils/include/render-utils/render_api_platform_types.h
rename to include/render-utils/render_api_platform_types.h
diff --git a/render-utils/include/render-utils/render_api_types.h b/include/render-utils/render_api_types.h
similarity index 100%
rename from render-utils/include/render-utils/render_api_types.h
rename to include/render-utils/render_api_types.h
diff --git a/render-utils/include/render-utils/virtio_gpu_ops.h b/include/render-utils/virtio_gpu_ops.h
similarity index 100%
rename from render-utils/include/render-utils/virtio_gpu_ops.h
rename to include/render-utils/virtio_gpu_ops.h
diff --git a/stream-servers/glestranslator/GLES_CM/CMakeLists.txt b/stream-servers/glestranslator/GLES_CM/CMakeLists.txt
index 7493592..5b5453f 100644
--- a/stream-servers/glestranslator/GLES_CM/CMakeLists.txt
+++ b/stream-servers/glestranslator/GLES_CM/CMakeLists.txt
@@ -15,6 +15,5 @@
GLES_CM_translator_static PRIVATE
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
- ${GFXSTREAM_REPO_ROOT}/gldispatch/include
${GFXSTREAM_REPO_ROOT}/stream-servers/
${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/include)
diff --git a/stream-servers/glestranslator/GLcommon/CMakeLists.txt b/stream-servers/glestranslator/GLcommon/CMakeLists.txt
index 7beb1b8..fb426cd 100644
--- a/stream-servers/glestranslator/GLcommon/CMakeLists.txt
+++ b/stream-servers/glestranslator/GLcommon/CMakeLists.txt
@@ -24,7 +24,6 @@
GLcommon PUBLIC
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
- ${GFXSTREAM_REPO_ROOT}/gldispatch/include
${GFXSTREAM_REPO_ROOT}/stream-servers
${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/include)
target_link_libraries(
diff --git a/stream-servers/libGLSnapshot/CMakeLists.txt b/stream-servers/libGLSnapshot/CMakeLists.txt
index d34752f..5122d4b 100644
--- a/stream-servers/libGLSnapshot/CMakeLists.txt
+++ b/stream-servers/libGLSnapshot/CMakeLists.txt
@@ -3,6 +3,5 @@
target_include_directories(GLSnapshot PUBLIC
${GFXSTREAM_REPO_ROOT}/stream-servers/libGLSnapshot
${GFXSTREAM_REPO_ROOT}/include
- ${GFXSTREAM_REPO_ROOT}/gldispatch/include
${GFXSTREAM_REPO_ROOT}/stream-servers
${GFXSTREAM_REPO_ROOT}/stream-servers/OpenGLESDispatch)
diff --git a/stream-servers/vulkan/CMakeLists.txt b/stream-servers/vulkan/CMakeLists.txt
index 883de9f..407c394 100644
--- a/stream-servers/vulkan/CMakeLists.txt
+++ b/stream-servers/vulkan/CMakeLists.txt
@@ -54,7 +54,6 @@
PRIVATE
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
- ${GFXSTREAM_REPO_ROOT}/gldispatch/include
${GFXSTREAM_REPO_ROOT}/stream-servers
${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan
${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common)
