Reland^2: Use "gfxstream" namespace
This reverts commit d37d7c8c0cdf6b84d453cb41e358094880a8f3b5.
Reland adds in aosp/2516595 which was only built on the "full"
target and removes namespace around window methods to satisfy
MacOS build.
Bug: b/271464937
Test: android build
Test: cmake build
Test: ATP MacOS build
Change-Id: Ida36ac16f9c3b98aedd744d21c9b27e9063a8eea
diff --git a/stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp b/stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp
index 405c4a4..d728621 100644
--- a/stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp
+++ b/stream-servers/gl/OpenGLESDispatch/OpenGLDispatchLoader.cpp
@@ -16,13 +16,12 @@
#include "OpenGLESDispatch/DispatchTables.h"
+namespace gfxstream {
+namespace gl {
+
GLESv1Dispatch s_gles1;
GLESv2Dispatch s_gles2;
-using emugl::LazyLoadedGLESv1Dispatch;
-using emugl::LazyLoadedGLESv2Dispatch;
-using emugl::LazyLoadedEGLDispatch;
-
// Must be declared outside of LazyLoaded*Dispatch scope due to the use of
// sizeof(T) within the template definition.
static LazyLoadedGLESv1Dispatch* sGLESv1Dispatch() {
@@ -79,3 +78,6 @@
}
LazyLoadedEGLDispatch::LazyLoadedEGLDispatch() { mValid = init_egl_dispatch(); }
+
+} // namespace gl
+} // namespace gfxstream
\ No newline at end of file
