gl: catch panic if gl not intialized

.gitignore

@@ -6,3 +6,6 @@
 *.cap
 /.vs/
 librashader_runtime_*.exe
+/test/capi-tests/librashader-capi-tests/.vs/
+/test/capi-tests/librashader-capi-tests/x64/
+/test/capi-tests/librashader-capi-tests/librashader-capi-tests/x64/

librashader-capi/src/runtime/gl.rs

@@ -4,6 +4,7 @@ use crate::ctypes::{libra_error_t, libra_gl_filter_chain_t, libra_shader_preset_
 use crate::error::{assert_non_null, assert_some, LibrashaderError};
 use crate::ffi::ffi_body;
 use std::mem::ManuallyDrop;
+use std::panic::catch_unwind;
 use librashader::runtime::FilterChain;
 use librashader::runtime::gl::{Framebuffer, GLImage, Viewport};
 
@@ -14,7 +15,7 @@ pub type gl_loader_t = unsafe extern "C" fn (*const c_char) -> *const c_void;
 /// Initialize the OpenGL Context for librashader.
 ///
 /// ## Safety
-/// Attempting to create a filter chain before initializing the GL context is undefined behaviour.
+/// Attempting to create a filter chain will fail.
 ///
 /// Reinitializing the OpenGL context with a different loader immediately invalidates previous filter
 /// chain objects, and drawing with them causes immediate undefined behaviour.
@@ -56,7 +57,9 @@ pub unsafe extern "C" fn libra_gl_create_filter_chain(preset: *mut libra_shader_
         } else {
             Some(unsafe { &*options })
         };
+
         let chain = librashader::runtime::gl::FilterChainGL::load_from_preset(*preset, options)?;
+
         unsafe {
             out.write(MaybeUninit::new(ManuallyDrop::new(Some(Box::new(chain)))))
         }
@@ -100,7 +103,6 @@ pub unsafe extern "C" fn libra_gl_filter_chain_frame(chain: *mut libra_gl_filter
                                                      mvp: *const f32,
 
 ) -> libra_error_t {
-
     ffi_body!(mut |chain| {
         assert_some!(chain);
         let chain = chain.as_mut().unwrap();

librashader-runtime-gl/src/error.rs

@@ -21,6 +21,8 @@ pub enum FilterChainError {
     ShaderReflectError(#[from] ShaderReflectError),
     #[error("lut loading error")]
     LutLoadError(#[from] ImageError),
+    #[error("opengl was not initialized")]
+    GLLoadError
 }
 
 pub type Result<T> = std::result::Result<T, FilterChainError>;

librashader-runtime-gl/src/filter_chain/mod.rs

@@ -1,3 +1,4 @@
+use std::panic::catch_unwind;
 use std::path::Path;
 use gl::types::{GLenum, GLuint};
 
@@ -37,16 +38,24 @@ impl FilterChainGL {
         preset: ShaderPreset,
         options: Option<&FilterChainOptionsGL>,
     ) -> Result<Self> {
-        if let Some(options) = options && options.use_dsa {
+        let result = catch_unwind(|| {
-            return Ok(Self {
+            if let Some(options) = options && options.use_dsa {
-                filter: FilterChainDispatch::DirectStateAccess(FilterChainImpl::load_from_preset(preset, Some(options))?)
+                return Ok(Self {
+                    filter: FilterChainDispatch::DirectStateAccess(FilterChainImpl::load_from_preset(preset, Some(options))?)
+                })
+            }
+            Ok(Self {
+                filter: FilterChainDispatch::Compatibility(FilterChainImpl::load_from_preset(
+                    preset, options,
+                )?),
             })
+        });
+        match result {
+            Err(_) => {
+                return Err(FilterChainError::GLLoadError)
+            }
+            Ok(res) => res
         }
-        Ok(Self {
-            filter: FilterChainDispatch::Compatibility(FilterChainImpl::load_from_preset(
-                preset, options,
-            )?),
-        })
     }
 
     /// Load the shader preset at the given path into a filter chain.

test/capi-tests/librashader-capi-tests/librashader-capi-tests.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32912.340
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librashader-capi-tests", "librashader-capi-tests\librashader-capi-tests.vcxproj", "{0B017393-E288-4467-BEBA-F89F7CD8E5D4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Debug|x64.ActiveCfg = Debug|x64
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Debug|x64.Build.0 = Debug|x64
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Debug|x86.ActiveCfg = Debug|Win32
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Debug|x86.Build.0 = Debug|Win32
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Release|x64.ActiveCfg = Release|x64
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Release|x64.Build.0 = Release|x64
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Release|x86.ActiveCfg = Release|Win32
+		{0B017393-E288-4467-BEBA-F89F7CD8E5D4}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0DC01001-8840-4149-9182-F5FD143BF40E}
+	EndGlobalSection
+EndGlobal

test/capi-tests/librashader-capi-tests/librashader-capi-tests/librashader-capi-tests.cpp

@@ -0,0 +1,30 @@
+// librashader-capi-tests.cpp : This file contains the 'main' function. Program execution begins and ends there.
+//
+
+#include <iostream>
+#include <filesystem>
+
+#include "librashader.h"
+int main()
+{
+    std::cout << "Hello World!\n";
+    std::cout << std::filesystem::current_path() << std::endl;
+    libra_shader_preset_t preset;
+    auto error = libra_load_preset("../../../slang-shaders/border/gameboy-player/gameboy-player-crt-royale.slangp", &preset);
+
+    libra_preset_print(&preset);
+    libra_gl_filter_chain_t chain;
+    libra_gl_create_filter_chain(&preset, NULL, &chain);
+    return 0;
+}
+
+// Run program: Ctrl + F5 or Debug > Start Without Debugging menu
+// Debug program: F5 or Debug > Start Debugging menu
+
+// Tips for Getting Started: 
+//   1. Use the Solution Explorer window to add/manage files
+//   2. Use the Team Explorer window to connect to source control
+//   3. Use the Output window to see build output and other messages
+//   4. Use the Error List window to view errors
+//   5. Go to Project > Add New Item to create new code files, or Project > Add Existing Item to add existing code files to the project
+//   6. In the future, to open this project again, go to File > Open > Project and select the .sln file

test/capi-tests/librashader-capi-tests/librashader-capi-tests/librashader-capi-tests.vcxproj

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{0b017393-e288-4467-beba-f89f7cd8e5d4}</ProjectGuid>
+    <RootNamespace>librashadercapitests</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>D:\coding\librashader\librashader-capi;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <TreatAngleIncludeAsExternal>false</TreatAngleIncludeAsExternal>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="librashader-capi-tests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\librashader-capi\librashader.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\target\debug\librashader_capi.dll.lib" />
+    <Library Include="..\..\..\..\target\debug\librashader_capi.lib" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\target\debug\librashader_capi.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

test/capi-tests/librashader-capi-tests/librashader-capi-tests/librashader-capi-tests.vcxproj.filters

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="librashader-capi-tests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\target\debug\librashader_capi.lib" />
+    <Library Include="..\..\..\..\target\debug\librashader_capi.dll.lib" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\librashader-capi\librashader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\target\debug\librashader_capi.dll" />
+  </ItemGroup>
+</Project>

test/capi-tests/librashader-capi-tests/librashader-capi-tests/librashader-capi-tests.vcxproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+</Project>