Revert "RDKEMW-11256: Reviewing copliot fixes"

This reverts commit bcea3f8.

Author: tboova469_comcast

rdke_splash_opengles/CMakeLists.txt

@@ -13,30 +13,7 @@ find_package(ZLIB REQUIRED)
 
 # Essos/Westeros are typically discovered via pkg-config in RDK/RDKE SDKs.
 pkg_check_modules(ESSOS REQUIRED IMPORTED_TARGET essos)
-
-# Different platforms/layers use different module names for the same library.
-# Allow override and try common defaults.
-set(WESTEROS_GL_PKGCONFIG_NAME "" CACHE STRING "pkg-config module name for Westeros GL (e.g. westeros-gl or westeros_gl)")
-
-if (WESTEROS_GL_PKGCONFIG_NAME)
-  pkg_check_modules(WESTEROS_GL QUIET IMPORTED_TARGET ${WESTEROS_GL_PKGCONFIG_NAME})
-else()
-  pkg_check_modules(WESTEROS_GL QUIET IMPORTED_TARGET westeros_gl)
-  if (NOT WESTEROS_GL_FOUND)
-    pkg_check_modules(WESTEROS_GL QUIET IMPORTED_TARGET westeros-gl)
-  endif()
-  if (NOT WESTEROS_GL_FOUND)
-    pkg_check_modules(WESTEROS_GL QUIET IMPORTED_TARGET westerosgl)
-  endif()
-endif()
-
-if (NOT WESTEROS_GL_FOUND)
-  # Some SDKs ship the library without a pkg-config file.
-  find_library(WESTEROS_GL_LIBRARY NAMES westeros_gl)
-  if (NOT WESTEROS_GL_LIBRARY)
-    message(FATAL_ERROR "Westeros GL not found. Tried pkg-config modules: westeros_gl, westeros-gl, westerosgl (or WESTEROS_GL_PKGCONFIG_NAME override) and library libwesteros_gl")
-  endif()
-endif()
+pkg_check_modules(WESTEROS_GL REQUIRED IMPORTED_TARGET westeros_gl)
 
 # EGL/GLESv2: locate both headers and libraries (important for sysroot builds).
 find_path(EGL_INCLUDE_DIR NAMES EGL/egl.h)
@@ -66,6 +43,7 @@ target_include_directories(rdke_splash PRIVATE
 )
 
 target_link_libraries(rdke_splash PRIVATE
+  PkgConfig::WESTEROS_GL
   PkgConfig::ESSOS
   ${EGL_LIBRARY}
   ${GLESv2_LIBRARY}
@@ -74,12 +52,6 @@ target_link_libraries(rdke_splash PRIVATE
   ZLIB::ZLIB
 )
 
-if (WESTEROS_GL_FOUND)
-  target_link_libraries(rdke_splash PRIVATE PkgConfig::WESTEROS_GL)
-else()
-  target_link_libraries(rdke_splash PRIVATE ${WESTEROS_GL_LIBRARY})
-endif()
-
 install(TARGETS rdke_splash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )

rdke_splash_opengles/src/main.cpp

@@ -550,13 +550,13 @@ void onEssosTerminated(void*)
     gShouldQuit = 1;
 }
 
-EssTerminateListener kTermListener = []() {
+const EssTerminateListener kTermListener = []() {
     EssTerminateListener l{};
     l.terminated = onEssosTerminated;
     return l;
 }();
 
-EssSettingsListener kSettingsListener = []() {
+const EssSettingsListener kSettingsListener = []() {
     EssSettingsListener l{};
     l.displaySize = onDisplaySize;
     return l;
@@ -637,11 +637,11 @@ int main(int argc, char** argv)
     }
     const uint64_t decodeMs = nowMs() - decodeStartMs;
 
-    GlProgram gl{};
-    const uint64_t glStartMs = nowMs();
-    if (ok)
+    //GlProgram gl{};
+    //const uint64_t glStartMs = nowMs();
+    if (!ok)
     {
-        auto prog = createProgramAndTexture(*image);
+        /*auto prog = createProgramAndTexture(*image);
         if (!prog)
         {
             ok = false;
@@ -650,14 +650,25 @@ int main(int argc, char** argv)
         {
             gl = *prog;
         }
+        */
+        const char* detail = EssContextGetLastErrorDetail(ctx);
+        std::printf("Startup failed. Essos detail: %s\n", (detail ? detail : "(none)"));
+        EssContextDestroy(ctx);
+        return 4;
     }
+    //const uint64_t glSetupMs = nowMs() - glStartMs;
+    gl = *prog;
     const uint64_t glSetupMs = nowMs() - glStartMs;
 
-    if (!ok)
+    //if (!ok)
+    GlProgram gl{};
+    const uint64_t glStartMs = nowMs();
+    auto prog = createProgramAndTexture(*image);
+    if (!prog)
     {
         const char* detail = EssContextGetLastErrorDetail(ctx);
         std::printf("Startup failed. Essos detail: %s\n", (detail ? detail : "(none)"));
-        destroyProgramAndTexture(gl);
+        //destroyProgramAndTexture(gl);
         EssContextDestroy(ctx);
         return 4;
     }