Add OpenGL OCIO GLSL support and tests

Implement OpenGL-specific OCIO runtime/preview/path and test support. Refactor OCIO shader runtime to support targets (Vulkan vs OpenGL), add ensure_ocio_shader_runtime_glsl and preflight_ocio_runtime_shader_glsl, and select the correct shader language for each target. Implement OpenGL OCIO preview pipeline in imiv_renderer_opengl.cpp (shader build, texture upload, uniforms, program lifecycle, drawing, and cleanup), wire renderer-specific preflight and cleanup in imiv_app.cpp, and add OpenGL-specific regression tests and a smoke regression script. Update CMake to conditionally register Vulkan or OpenGL test variants and add documentation for backend coverage (imiv_backends.md).

Author: ssh4net

src/imiv/CMakeLists.txt

@@ -836,59 +836,117 @@ if (TARGET imiv
         AND BUILD_TESTING
         AND Python3_EXECUTABLE
         AND _imiv_test_engine_sources
-        AND _imiv_has_runtime_glslang
         AND EXISTS "${_imiv_ocio_live_update_config}")
-    add_test (
-        NAME imiv_ocio_live_update_regression
-        COMMAND
-            "${Python3_EXECUTABLE}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
-            --bin "$<TARGET_FILE:imiv>"
-            --cwd "$<TARGET_FILE_DIR:imiv>"
-            --oiiotool "$<TARGET_FILE:oiiotool>"
-            --idiff "$<TARGET_FILE:idiff>"
-            --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
-            --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_update_regression"
-            --image "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_update_regression/ocio_live_input.exr"
-            --ocio-config "${_imiv_ocio_live_update_config}")
-    set_tests_properties (
-        imiv_ocio_live_update_regression PROPERTIES
-            LABELS "imiv;imiv_ocio;gui"
-            TIMEOUT 300)
+    if (_imiv_renderer_is_vulkan AND _imiv_has_runtime_glslang)
+        add_test (
+            NAME imiv_ocio_live_update_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --oiiotool "$<TARGET_FILE:oiiotool>"
+                --idiff "$<TARGET_FILE:idiff>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_update_regression"
+                --image "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_update_regression/ocio_live_input.exr"
+                --ocio-config "${_imiv_ocio_live_update_config}")
+        set_tests_properties (
+            imiv_ocio_live_update_regression PROPERTIES
+                LABELS "imiv;imiv_ocio;gui"
+                TIMEOUT 300)
 
-    add_test (
-        NAME imiv_ocio_live_display_update_regression
-        COMMAND
-            "${Python3_EXECUTABLE}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
-            --bin "$<TARGET_FILE:imiv>"
-            --cwd "$<TARGET_FILE_DIR:imiv>"
-            --oiiotool "$<TARGET_FILE:oiiotool>"
-            --idiff "$<TARGET_FILE:idiff>"
-            --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
-            --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_display_update_regression"
-            --image "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_display_update_regression/ocio_live_input.exr"
-            --ocio-config "${_imiv_ocio_live_update_config}"
-            --display "sRGB - Display"
-            --target-display "Display P3 - Display"
-            --raw-view "Un-tone-mapped"
-            --target-view "Un-tone-mapped")
-    set_tests_properties (
-        imiv_ocio_live_display_update_regression PROPERTIES
-            LABELS "imiv;imiv_ocio;gui"
-            TIMEOUT 300)
+        add_test (
+            NAME imiv_ocio_live_display_update_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --oiiotool "$<TARGET_FILE:oiiotool>"
+                --idiff "$<TARGET_FILE:idiff>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_display_update_regression"
+                --image "${CMAKE_BINARY_DIR}/imiv_captures/ocio_live_display_update_regression/ocio_live_input.exr"
+                --ocio-config "${_imiv_ocio_live_update_config}"
+                --display "sRGB - Display"
+                --target-display "Display P3 - Display"
+                --raw-view "Un-tone-mapped"
+                --target-view "Un-tone-mapped")
+        set_tests_properties (
+            imiv_ocio_live_display_update_regression PROPERTIES
+                LABELS "imiv;imiv_ocio;gui"
+                TIMEOUT 300)
+    elseif (_imiv_renderer_is_opengl)
+        add_test (
+            NAME imiv_opengl_ocio_live_update_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --oiiotool "$<TARGET_FILE:oiiotool>"
+                --idiff "$<TARGET_FILE:idiff>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/opengl_ocio_live_update_regression"
+                --image "${CMAKE_BINARY_DIR}/imiv_captures/opengl_ocio_live_update_regression/ocio_live_input.exr"
+                --ocio-config "${_imiv_ocio_live_update_config}")
+        set_tests_properties (
+            imiv_opengl_ocio_live_update_regression PROPERTIES
+                LABELS "imiv;imiv_ocio;imiv_opengl;gui"
+                TIMEOUT 300)
+
+        add_test (
+            NAME imiv_opengl_ocio_live_display_update_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_ocio_live_update_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --oiiotool "$<TARGET_FILE:oiiotool>"
+                --idiff "$<TARGET_FILE:idiff>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/opengl_ocio_live_display_update_regression"
+                --image "${CMAKE_BINARY_DIR}/imiv_captures/opengl_ocio_live_display_update_regression/ocio_live_input.exr"
+                --ocio-config "${_imiv_ocio_live_update_config}"
+                --display "sRGB - Display"
+                --target-display "Display P3 - Display"
+                --raw-view "Un-tone-mapped"
+                --target-view "Un-tone-mapped")
+        set_tests_properties (
+            imiv_opengl_ocio_live_display_update_regression PROPERTIES
+                LABELS "imiv;imiv_ocio;imiv_opengl;gui"
+                TIMEOUT 300)
+    endif ()
 elseif (TARGET imiv
         AND OIIO_BUILD_TESTS
         AND BUILD_TESTING)
     message (STATUS
-             "imiv: live OCIO update regression test not added (requires Python3, ImGui Test Engine, runtime glslang, and temp OCIO config)")
+             "imiv: live OCIO update regression test not added (requires Python3, ImGui Test Engine, temp OCIO config, and either Vulkan runtime glslang or the OpenGL renderer)")
 endif ()
 
 if (TARGET imiv
         AND OIIO_BUILD_TESTS
         AND BUILD_TESTING
         AND Python3_EXECUTABLE
         AND _imiv_test_engine_sources)
+    if (_imiv_renderer_is_opengl)
+        add_test (
+            NAME imiv_opengl_smoke_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_opengl_smoke_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/opengl_smoke_regression"
+                --open "${PROJECT_SOURCE_DIR}/ASWF/logos/openimageio-stacked-gradient.png")
+        set_tests_properties (
+            imiv_opengl_smoke_regression PROPERTIES
+                LABELS "imiv;imiv_opengl;gui"
+                TIMEOUT 180)
+    endif ()
+
     if (EXISTS "${_imiv_ocio_live_update_config}")
         add_test (
             NAME imiv_ocio_config_source_regression

src/imiv/imiv_app.cpp

@@ -424,8 +424,20 @@ run(const AppConfig& config)
     clamp_placeholder_ui_state(ui_state);
     if (ui_state.use_ocio) {
         std::string ocio_preflight_error;
-        if (!preflight_ocio_runtime_shader(ui_state, nullptr,
-                                           ocio_preflight_error)) {
+#if defined(IMIV_BACKEND_VULKAN_GLFW)
+        const bool ocio_preflight_ok
+            = preflight_ocio_runtime_shader(ui_state, nullptr,
+                                            ocio_preflight_error);
+#elif defined(IMIV_BACKEND_OPENGL_GLFW)
+        const bool ocio_preflight_ok
+            = preflight_ocio_runtime_shader_glsl(ui_state, nullptr,
+                                                 ocio_preflight_error);
+#else
+        ocio_preflight_error
+            = "OCIO preview is not implemented on this renderer";
+        const bool ocio_preflight_ok = false;
+#endif
+        if (!ocio_preflight_ok) {
             ui_state.use_ocio = false;
             if (verbose_logging) {
                 print("imiv: OCIO preflight unavailable, using standard "
@@ -605,6 +617,10 @@ run(const AppConfig& config)
 #if defined(IMIV_BACKEND_VULKAN_GLFW) || defined(IMIV_BACKEND_METAL_GLFW) \
     || defined(IMIV_BACKEND_OPENGL_GLFW)
     uninstall_drag_drop(window);
+#endif
+#if defined(IMIV_BACKEND_OPENGL_GLFW)
+    renderer_cleanup_window(renderer_state);
+    renderer_cleanup(renderer_state);
 #endif
     renderer_imgui_shutdown();
     platform_glfw_imgui_shutdown();
@@ -613,8 +629,10 @@ run(const AppConfig& config)
     test_engine_destroy(test_engine_runtime);
 #endif
 
+#if !defined(IMIV_BACKEND_OPENGL_GLFW)
     renderer_cleanup_window(renderer_state);
     renderer_cleanup(renderer_state);
+#endif
     platform_glfw_destroy_window(window);
     platform_glfw_terminate();
     return EXIT_SUCCESS;