commit 28d1afb1333f634595c639bd110a4012e704799a
author Andrew Woloszyn <awoloszyn@google.com> Thu Dec 01 20:17:59 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Dec 01 12:18:39 2022 -0800
tree c8d9a6093cb1521fad165b695d4a721413acc8bd
parent da7633e4e2c2b15e4005137e76f0a0427267e26e

Merge "Some minor fixes for issues coming up trying to run on Windows."

GitOrigin-RevId: 09dc82008cdc528d7e75d3a4636d27ab1a3134c1
Change-Id: I54bf43981cffe0e9fc317658ac3d9265cc4c77ab

stream-servers/gl/EmulationGl.cpp

diff --git a/stream-servers/gl/EmulationGl.cpp b/stream-servers/gl/EmulationGl.cpp
index a58f037..fbc8dd8 100644
--- a/stream-servers/gl/EmulationGl.cpp
+++ b/stream-servers/gl/EmulationGl.cpp
@@ -488,7 +488,7 @@
         mDisplayGl->unbindFromSurface();
     }
 
-    {
+    if (mPbufferSurface) {
         const auto* displaySurfaceGl =
             reinterpret_cast<const DisplaySurfaceGl*>(mPbufferSurface->getImpl());
 

stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp

diff --git a/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp b/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
index 26465e5..9068f9c 100644
--- a/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
@@ -222,8 +222,8 @@
     }
 
     const char* kAngleName = "ANGLE";
-    if (0 == strncmp(reinterpret_cast<const char*>(glGetString(GL_RENDERER)),
-                     kAngleName, strlen(kAngleName))) {
+    const char* glString = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+    if (glString && 0 == strncmp(glString, kAngleName, strlen(kAngleName))) {
         // ANGLE loads a bad glGetTexImage. (No it is not the dummy.)
         // Overwrite it.
         void* _glGetTexImageANGLE =

stream-servers/vulkan/VulkanDispatch.cpp

diff --git a/stream-servers/vulkan/VulkanDispatch.cpp b/stream-servers/vulkan/VulkanDispatch.cpp
index ca52d77..c018428 100644
--- a/stream-servers/vulkan/VulkanDispatch.cpp
+++ b/stream-servers/vulkan/VulkanDispatch.cpp
@@ -37,8 +37,12 @@
 
 static std::string icdJsonNameToProgramAndLauncherPaths(const std::string& icdFilename) {
     std::string suffix = pj({"lib64", "vulkan", icdFilename});
-
-    return pj({android::base::getProgramDirectory(), suffix}) + ":" +
+#if defined(_WIN32)
+    const char* sep = ";";
+#else
+    const char* sep = ":";
+#endif
+    return pj({android::base::getProgramDirectory(), suffix}) + sep +
            pj({android::base::getLauncherDirectory(), suffix});
 }