Move glestranslator to the new "gl" subdirectory
... and update build.
Bug: b/233939967
Test: android build
Test: cmake build
Test: cvd start --gpu_mode=gfxstream
Change-Id: Iba34eac20b120535c1439b2902b72d88f056ca33
diff --git a/Android.bp b/Android.bp
index 16c8b36..001d8e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,7 +52,7 @@
"snapshot/include",
"stream-servers",
"stream-servers/gl",
- "stream-servers/glestranslator/include",
+ "stream-servers/gl/glestranslator/include",
"stream-servers/vulkan",
],
header_libs: ["gfxstream_vulkan_headers"],
diff --git a/stream-servers/CMakeLists.txt b/stream-servers/CMakeLists.txt
index db7eb71..fcc3b4d 100644
--- a/stream-servers/CMakeLists.txt
+++ b/stream-servers/CMakeLists.txt
@@ -8,8 +8,6 @@
# Vulkan
add_subdirectory(vulkan)
-# GLES translator
-add_subdirectory(glestranslator)
add_subdirectory(libGLSnapshot)
# RenderControl decoder
@@ -157,8 +155,8 @@
${GFXSTREAM_REPO_ROOT}/base/testing
${GFXSTREAM_REPO_ROOT}/include
${GFXSTREAM_REPO_ROOT}/stream-servers
- ${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/GLES_CM
- ${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/include
+ ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/GLES_CM
+ ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include
${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan)
target_link_libraries(
diff --git a/stream-servers/gl/CMakeLists.txt b/stream-servers/gl/CMakeLists.txt
index ca4b026..b9e1c93 100644
--- a/stream-servers/gl/CMakeLists.txt
+++ b/stream-servers/gl/CMakeLists.txt
@@ -5,6 +5,9 @@
# GLES dispatch based on Translator
add_subdirectory(OpenGLESDispatch)
+# GLES translator
+add_subdirectory(glestranslator)
+
add_library(gfxstream-gl-server
EmulatedEglConfig.cpp)
diff --git a/stream-servers/glestranslator/CMakeLists.txt b/stream-servers/gl/glestranslator/CMakeLists.txt
similarity index 100%
rename from stream-servers/glestranslator/CMakeLists.txt
rename to stream-servers/gl/glestranslator/CMakeLists.txt
diff --git a/stream-servers/glestranslator/EGL/Android.bp b/stream-servers/gl/glestranslator/EGL/Android.bp
similarity index 100%
rename from stream-servers/glestranslator/EGL/Android.bp
rename to stream-servers/gl/glestranslator/EGL/Android.bp
diff --git a/stream-servers/glestranslator/EGL/CMakeLists.txt b/stream-servers/gl/glestranslator/EGL/CMakeLists.txt
similarity index 100%
rename from stream-servers/glestranslator/EGL/CMakeLists.txt
rename to stream-servers/gl/glestranslator/EGL/CMakeLists.txt
diff --git a/stream-servers/glestranslator/EGL/ClientAPIExts.cpp b/stream-servers/gl/glestranslator/EGL/ClientAPIExts.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/ClientAPIExts.cpp
rename to stream-servers/gl/glestranslator/EGL/ClientAPIExts.cpp
diff --git a/stream-servers/glestranslator/EGL/ClientAPIExts.h b/stream-servers/gl/glestranslator/EGL/ClientAPIExts.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/ClientAPIExts.h
rename to stream-servers/gl/glestranslator/EGL/ClientAPIExts.h
diff --git a/stream-servers/glestranslator/EGL/ClientAPIExts.in b/stream-servers/gl/glestranslator/EGL/ClientAPIExts.in
similarity index 100%
rename from stream-servers/glestranslator/EGL/ClientAPIExts.in
rename to stream-servers/gl/glestranslator/EGL/ClientAPIExts.in
diff --git a/stream-servers/glestranslator/EGL/CoreProfileConfigs.h b/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/CoreProfileConfigs.h
rename to stream-servers/gl/glestranslator/EGL/CoreProfileConfigs.h
diff --git a/stream-servers/glestranslator/EGL/CoreProfileConfigs_linux.cpp b/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/CoreProfileConfigs_linux.cpp
rename to stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_linux.cpp
diff --git a/stream-servers/glestranslator/EGL/CoreProfileConfigs_windows.cpp b/stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/CoreProfileConfigs_windows.cpp
rename to stream-servers/gl/glestranslator/EGL/CoreProfileConfigs_windows.cpp
diff --git a/stream-servers/glestranslator/EGL/EglConfig.cpp b/stream-servers/gl/glestranslator/EGL/EglConfig.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglConfig.cpp
rename to stream-servers/gl/glestranslator/EGL/EglConfig.cpp
diff --git a/stream-servers/glestranslator/EGL/EglConfig.h b/stream-servers/gl/glestranslator/EGL/EglConfig.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglConfig.h
rename to stream-servers/gl/glestranslator/EGL/EglConfig.h
diff --git a/stream-servers/glestranslator/EGL/EglContext.cpp b/stream-servers/gl/glestranslator/EGL/EglContext.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglContext.cpp
rename to stream-servers/gl/glestranslator/EGL/EglContext.cpp
diff --git a/stream-servers/glestranslator/EGL/EglContext.h b/stream-servers/gl/glestranslator/EGL/EglContext.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglContext.h
rename to stream-servers/gl/glestranslator/EGL/EglContext.h
diff --git a/stream-servers/glestranslator/EGL/EglDisplay.cpp b/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglDisplay.cpp
rename to stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
diff --git a/stream-servers/glestranslator/EGL/EglDisplay.h b/stream-servers/gl/glestranslator/EGL/EglDisplay.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglDisplay.h
rename to stream-servers/gl/glestranslator/EGL/EglDisplay.h
diff --git a/stream-servers/glestranslator/EGL/EglGlobalInfo.cpp b/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglGlobalInfo.cpp
rename to stream-servers/gl/glestranslator/EGL/EglGlobalInfo.cpp
diff --git a/stream-servers/glestranslator/EGL/EglGlobalInfo.h b/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglGlobalInfo.h
rename to stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
diff --git a/stream-servers/glestranslator/EGL/EglImp.cpp b/stream-servers/gl/glestranslator/EGL/EglImp.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglImp.cpp
rename to stream-servers/gl/glestranslator/EGL/EglImp.cpp
diff --git a/stream-servers/glestranslator/EGL/EglOsApi.h b/stream-servers/gl/glestranslator/EGL/EglOsApi.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglOsApi.h
rename to stream-servers/gl/glestranslator/EGL/EglOsApi.h
diff --git a/stream-servers/glestranslator/EGL/EglOsApi_darwin.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglOsApi_darwin.cpp
rename to stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
diff --git a/stream-servers/glestranslator/EGL/EglOsApi_egl.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglOsApi_egl.cpp
rename to stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
diff --git a/stream-servers/glestranslator/EGL/EglOsApi_glx.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglOsApi_glx.cpp
rename to stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
diff --git a/stream-servers/glestranslator/EGL/EglOsApi_wgl.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglOsApi_wgl.cpp
rename to stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
diff --git a/stream-servers/glestranslator/EGL/EglPbufferSurface.cpp b/stream-servers/gl/glestranslator/EGL/EglPbufferSurface.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglPbufferSurface.cpp
rename to stream-servers/gl/glestranslator/EGL/EglPbufferSurface.cpp
diff --git a/stream-servers/glestranslator/EGL/EglPbufferSurface.h b/stream-servers/gl/glestranslator/EGL/EglPbufferSurface.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglPbufferSurface.h
rename to stream-servers/gl/glestranslator/EGL/EglPbufferSurface.h
diff --git a/stream-servers/glestranslator/EGL/EglSurface.cpp b/stream-servers/gl/glestranslator/EGL/EglSurface.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglSurface.cpp
rename to stream-servers/gl/glestranslator/EGL/EglSurface.cpp
diff --git a/stream-servers/glestranslator/EGL/EglSurface.h b/stream-servers/gl/glestranslator/EGL/EglSurface.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglSurface.h
rename to stream-servers/gl/glestranslator/EGL/EglSurface.h
diff --git a/stream-servers/glestranslator/EGL/EglThreadInfo.cpp b/stream-servers/gl/glestranslator/EGL/EglThreadInfo.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglThreadInfo.cpp
rename to stream-servers/gl/glestranslator/EGL/EglThreadInfo.cpp
diff --git a/stream-servers/glestranslator/EGL/EglThreadInfo.h b/stream-servers/gl/glestranslator/EGL/EglThreadInfo.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglThreadInfo.h
rename to stream-servers/gl/glestranslator/EGL/EglThreadInfo.h
diff --git a/stream-servers/glestranslator/EGL/EglValidate.cpp b/stream-servers/gl/glestranslator/EGL/EglValidate.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglValidate.cpp
rename to stream-servers/gl/glestranslator/EGL/EglValidate.cpp
diff --git a/stream-servers/glestranslator/EGL/EglValidate.h b/stream-servers/gl/glestranslator/EGL/EglValidate.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglValidate.h
rename to stream-servers/gl/glestranslator/EGL/EglValidate.h
diff --git a/stream-servers/glestranslator/EGL/EglWindowSurface.cpp b/stream-servers/gl/glestranslator/EGL/EglWindowSurface.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglWindowSurface.cpp
rename to stream-servers/gl/glestranslator/EGL/EglWindowSurface.cpp
diff --git a/stream-servers/glestranslator/EGL/EglWindowSurface.h b/stream-servers/gl/glestranslator/EGL/EglWindowSurface.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/EglWindowSurface.h
rename to stream-servers/gl/glestranslator/EGL/EglWindowSurface.h
diff --git a/stream-servers/glestranslator/EGL/MacNative.h b/stream-servers/gl/glestranslator/EGL/MacNative.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/MacNative.h
rename to stream-servers/gl/glestranslator/EGL/MacNative.h
diff --git a/stream-servers/glestranslator/EGL/MacNative.m b/stream-servers/gl/glestranslator/EGL/MacNative.m
similarity index 100%
rename from stream-servers/glestranslator/EGL/MacNative.m
rename to stream-servers/gl/glestranslator/EGL/MacNative.m
diff --git a/stream-servers/glestranslator/EGL/MacPixelFormatsAttribs.h b/stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/MacPixelFormatsAttribs.h
rename to stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.h
diff --git a/stream-servers/glestranslator/EGL/MacPixelFormatsAttribs.m b/stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.m
similarity index 100%
rename from stream-servers/glestranslator/EGL/MacPixelFormatsAttribs.m
rename to stream-servers/gl/glestranslator/EGL/MacPixelFormatsAttribs.m
diff --git a/stream-servers/glestranslator/EGL/ShaderCache.cpp b/stream-servers/gl/glestranslator/EGL/ShaderCache.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/ShaderCache.cpp
rename to stream-servers/gl/glestranslator/EGL/ShaderCache.cpp
diff --git a/stream-servers/glestranslator/EGL/ShaderCache.h b/stream-servers/gl/glestranslator/EGL/ShaderCache.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/ShaderCache.h
rename to stream-servers/gl/glestranslator/EGL/ShaderCache.h
diff --git a/stream-servers/glestranslator/EGL/ThreadInfo.cpp b/stream-servers/gl/glestranslator/EGL/ThreadInfo.cpp
similarity index 100%
rename from stream-servers/glestranslator/EGL/ThreadInfo.cpp
rename to stream-servers/gl/glestranslator/EGL/ThreadInfo.cpp
diff --git a/stream-servers/glestranslator/EGL/ThreadInfo.h b/stream-servers/gl/glestranslator/EGL/ThreadInfo.h
similarity index 100%
rename from stream-servers/glestranslator/EGL/ThreadInfo.h
rename to stream-servers/gl/glestranslator/EGL/ThreadInfo.h
diff --git a/stream-servers/glestranslator/GLES_CM/Android.bp b/stream-servers/gl/glestranslator/GLES_CM/Android.bp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/Android.bp
rename to stream-servers/gl/glestranslator/GLES_CM/Android.bp
diff --git a/stream-servers/glestranslator/GLES_CM/CMakeLists.txt b/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
similarity index 90%
rename from stream-servers/glestranslator/GLES_CM/CMakeLists.txt
rename to stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
index 69993cd..2a92780 100644
--- a/stream-servers/glestranslator/GLES_CM/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
@@ -17,4 +17,4 @@
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
${GFXSTREAM_REPO_ROOT}/stream-servers/
- ${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/include)
+ ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include)
diff --git a/stream-servers/glestranslator/GLES_CM/CoreProfileEngine.cpp b/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/CoreProfileEngine.cpp
rename to stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
diff --git a/stream-servers/glestranslator/GLES_CM/CoreProfileEngine.h b/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/CoreProfileEngine.h
rename to stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.h
diff --git a/stream-servers/glestranslator/GLES_CM/CoreProfileEngineShaders.h b/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/CoreProfileEngineShaders.h
rename to stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngineShaders.h
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmContext.cpp b/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmContext.cpp
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmContext.h b/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmContext.h
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.h
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmImp.cpp b/stream-servers/gl/glestranslator/GLES_CM/GLEScmImp.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmImp.cpp
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmImp.cpp
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmUtils.cpp b/stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmUtils.cpp
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.cpp
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmUtils.h b/stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmUtils.h
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmUtils.h
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmValidate.cpp b/stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmValidate.cpp
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.cpp
diff --git a/stream-servers/glestranslator/GLES_CM/GLEScmValidate.h b/stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_CM/GLEScmValidate.h
rename to stream-servers/gl/glestranslator/GLES_CM/GLEScmValidate.h
diff --git a/stream-servers/glestranslator/GLES_V2/ANGLEShaderParser.cpp b/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ANGLEShaderParser.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/ANGLEShaderParser.h b/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ANGLEShaderParser.h
rename to stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.h
diff --git a/stream-servers/glestranslator/GLES_V2/Android.bp b/stream-servers/gl/glestranslator/GLES_V2/Android.bp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/Android.bp
rename to stream-servers/gl/glestranslator/GLES_V2/Android.bp
diff --git a/stream-servers/glestranslator/GLES_V2/CMakeLists.txt b/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/CMakeLists.txt
rename to stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv2Context.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv2Context.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv2Context.h b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv2Context.h
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.h
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv2Imp.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv2Imp.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv2Validate.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv2Validate.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv2Validate.h b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv2Validate.h
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv2Validate.h
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv30Imp.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv30Imp.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv30Imp.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv30Imp.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv31Imp.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv31Imp.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv31Imp.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv31Imp.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/GLESv32Imp.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv32Imp.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/GLESv32Imp.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/GLESv32Imp.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/ProgramData.cpp b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ProgramData.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/ProgramData.h b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ProgramData.h
rename to stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
diff --git a/stream-servers/glestranslator/GLES_V2/SamplerData.cpp b/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/SamplerData.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/SamplerData.h b/stream-servers/gl/glestranslator/GLES_V2/SamplerData.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/SamplerData.h
rename to stream-servers/gl/glestranslator/GLES_V2/SamplerData.h
diff --git a/stream-servers/glestranslator/GLES_V2/ShaderParser.cpp b/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ShaderParser.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/ShaderParser.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/ShaderParser.h b/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ShaderParser.h
rename to stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
diff --git a/stream-servers/glestranslator/GLES_V2/ShaderValidator.cpp b/stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ShaderValidator.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/ShaderValidator.h b/stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/ShaderValidator.h
rename to stream-servers/gl/glestranslator/GLES_V2/ShaderValidator.h
diff --git a/stream-servers/glestranslator/GLES_V2/TransformFeedbackData.cpp b/stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/TransformFeedbackData.cpp
rename to stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.cpp
diff --git a/stream-servers/glestranslator/GLES_V2/TransformFeedbackData.h b/stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.h
similarity index 100%
rename from stream-servers/glestranslator/GLES_V2/TransformFeedbackData.h
rename to stream-servers/gl/glestranslator/GLES_V2/TransformFeedbackData.h
diff --git a/stream-servers/glestranslator/GLcommon/Android.bp b/stream-servers/gl/glestranslator/GLcommon/Android.bp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/Android.bp
rename to stream-servers/gl/glestranslator/GLcommon/Android.bp
diff --git a/stream-servers/glestranslator/GLcommon/CMakeLists.txt b/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
similarity index 95%
rename from stream-servers/glestranslator/GLcommon/CMakeLists.txt
rename to stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
index f2e6ad6..d05dee7 100644
--- a/stream-servers/glestranslator/GLcommon/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
@@ -25,7 +25,7 @@
${GFXSTREAM_REPO_ROOT}
${GFXSTREAM_REPO_ROOT}/include
${GFXSTREAM_REPO_ROOT}/stream-servers
- ${GFXSTREAM_REPO_ROOT}/stream-servers/glestranslator/include)
+ ${GFXSTREAM_REPO_ROOT}/stream-servers/gl/glestranslator/include)
target_link_libraries(
GLcommon PUBLIC
gfxstream-base.headers
diff --git a/stream-servers/glestranslator/GLcommon/Etc2_unittest.cpp b/stream-servers/gl/glestranslator/GLcommon/Etc2_unittest.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/Etc2_unittest.cpp
rename to stream-servers/gl/glestranslator/GLcommon/Etc2_unittest.cpp
diff --git a/stream-servers/glestranslator/GLcommon/FramebufferData.cpp b/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/FramebufferData.cpp
rename to stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLBackgroundLoader.cpp b/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLBackgroundLoader.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLDispatch.cpp b/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLDispatch.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLESbuffer.cpp b/stream-servers/gl/glestranslator/GLcommon/GLESbuffer.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLESbuffer.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLESbuffer.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLEScontext.cpp b/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLEScontext.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLESpointer.cpp b/stream-servers/gl/glestranslator/GLcommon/GLESpointer.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLESpointer.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLESpointer.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLESvalidate.cpp b/stream-servers/gl/glestranslator/GLcommon/GLESvalidate.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLESvalidate.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLESvalidate.cpp
diff --git a/stream-servers/glestranslator/GLcommon/GLutils.cpp b/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/GLutils.cpp
rename to stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
diff --git a/stream-servers/glestranslator/GLcommon/NamedObject.cpp b/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/NamedObject.cpp
rename to stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
diff --git a/stream-servers/glestranslator/GLcommon/ObjectData.cpp b/stream-servers/gl/glestranslator/GLcommon/ObjectData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/ObjectData.cpp
rename to stream-servers/gl/glestranslator/GLcommon/ObjectData.cpp
diff --git a/stream-servers/glestranslator/GLcommon/ObjectNameSpace.cpp b/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/ObjectNameSpace.cpp
rename to stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
diff --git a/stream-servers/glestranslator/GLcommon/PaletteTexture.cpp b/stream-servers/gl/glestranslator/GLcommon/PaletteTexture.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/PaletteTexture.cpp
rename to stream-servers/gl/glestranslator/GLcommon/PaletteTexture.cpp
diff --git a/stream-servers/glestranslator/GLcommon/RangeManip.cpp b/stream-servers/gl/glestranslator/GLcommon/RangeManip.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/RangeManip.cpp
rename to stream-servers/gl/glestranslator/GLcommon/RangeManip.cpp
diff --git a/stream-servers/glestranslator/GLcommon/SaveableTexture.cpp b/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/SaveableTexture.cpp
rename to stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
diff --git a/stream-servers/glestranslator/GLcommon/ScopedGLState.cpp b/stream-servers/gl/glestranslator/GLcommon/ScopedGLState.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/ScopedGLState.cpp
rename to stream-servers/gl/glestranslator/GLcommon/ScopedGLState.cpp
diff --git a/stream-servers/glestranslator/GLcommon/ShareGroup.cpp b/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/ShareGroup.cpp
rename to stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
diff --git a/stream-servers/glestranslator/GLcommon/TextureData.cpp b/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/TextureData.cpp
rename to stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
diff --git a/stream-servers/glestranslator/GLcommon/TextureUtils.cpp b/stream-servers/gl/glestranslator/GLcommon/TextureUtils.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/TextureUtils.cpp
rename to stream-servers/gl/glestranslator/GLcommon/TextureUtils.cpp
diff --git a/stream-servers/glestranslator/GLcommon/etc.cpp b/stream-servers/gl/glestranslator/GLcommon/etc.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/etc.cpp
rename to stream-servers/gl/glestranslator/GLcommon/etc.cpp
diff --git a/stream-servers/glestranslator/GLcommon/rgtc.cpp b/stream-servers/gl/glestranslator/GLcommon/rgtc.cpp
similarity index 100%
rename from stream-servers/glestranslator/GLcommon/rgtc.cpp
rename to stream-servers/gl/glestranslator/GLcommon/rgtc.cpp
diff --git a/stream-servers/glestranslator/include/GLcommon/FramebufferData.h b/stream-servers/gl/glestranslator/include/GLcommon/FramebufferData.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/FramebufferData.h
rename to stream-servers/gl/glestranslator/include/GLcommon/FramebufferData.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLBackgroundLoader.h b/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLBackgroundLoader.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLDispatch.h b/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLDispatch.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLESbuffer.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLESbuffer.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLEScontext.h b/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLEScontext.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLESmacros.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLESmacros.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLESpointer.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLESpointer.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLESvalidate.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESvalidate.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLESvalidate.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLESvalidate.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLLibrary.h b/stream-servers/gl/glestranslator/include/GLcommon/GLLibrary.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLLibrary.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLLibrary.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLSnapshotSerializers.h b/stream-servers/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLSnapshotSerializers.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLSnapshotSerializers.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLconversion_macros.h b/stream-servers/gl/glestranslator/include/GLcommon/GLconversion_macros.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLconversion_macros.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLconversion_macros.h
diff --git a/stream-servers/glestranslator/include/GLcommon/GLutils.h b/stream-servers/gl/glestranslator/include/GLcommon/GLutils.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/GLutils.h
rename to stream-servers/gl/glestranslator/include/GLcommon/GLutils.h
diff --git a/stream-servers/glestranslator/include/GLcommon/NamedObject.h b/stream-servers/gl/glestranslator/include/GLcommon/NamedObject.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/NamedObject.h
rename to stream-servers/gl/glestranslator/include/GLcommon/NamedObject.h
diff --git a/stream-servers/glestranslator/include/GLcommon/ObjectData.h b/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/ObjectData.h
rename to stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
diff --git a/stream-servers/glestranslator/include/GLcommon/ObjectNameSpace.h b/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/ObjectNameSpace.h
rename to stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
diff --git a/stream-servers/glestranslator/include/GLcommon/PaletteTexture.h b/stream-servers/gl/glestranslator/include/GLcommon/PaletteTexture.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/PaletteTexture.h
rename to stream-servers/gl/glestranslator/include/GLcommon/PaletteTexture.h
diff --git a/stream-servers/glestranslator/include/GLcommon/RangeManip.h b/stream-servers/gl/glestranslator/include/GLcommon/RangeManip.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/RangeManip.h
rename to stream-servers/gl/glestranslator/include/GLcommon/RangeManip.h
diff --git a/stream-servers/glestranslator/include/GLcommon/SaveableTexture.h b/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/SaveableTexture.h
rename to stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
diff --git a/stream-servers/glestranslator/include/GLcommon/ScopedGLState.h b/stream-servers/gl/glestranslator/include/GLcommon/ScopedGLState.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/ScopedGLState.h
rename to stream-servers/gl/glestranslator/include/GLcommon/ScopedGLState.h
diff --git a/stream-servers/glestranslator/include/GLcommon/ShareGroup.h b/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/ShareGroup.h
rename to stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
diff --git a/stream-servers/glestranslator/include/GLcommon/TextureData.h b/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/TextureData.h
rename to stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
diff --git a/stream-servers/glestranslator/include/GLcommon/TextureUtils.h b/stream-servers/gl/glestranslator/include/GLcommon/TextureUtils.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/TextureUtils.h
rename to stream-servers/gl/glestranslator/include/GLcommon/TextureUtils.h
diff --git a/stream-servers/glestranslator/include/GLcommon/TranslatorIfaces.h b/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/TranslatorIfaces.h
rename to stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
diff --git a/stream-servers/glestranslator/include/GLcommon/etc.h b/stream-servers/gl/glestranslator/include/GLcommon/etc.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/etc.h
rename to stream-servers/gl/glestranslator/include/GLcommon/etc.h
diff --git a/stream-servers/glestranslator/include/GLcommon/rgtc.h b/stream-servers/gl/glestranslator/include/GLcommon/rgtc.h
similarity index 100%
rename from stream-servers/glestranslator/include/GLcommon/rgtc.h
rename to stream-servers/gl/glestranslator/include/GLcommon/rgtc.h
