Improve shader version selection

1 files changed, 14 insertions, 6 deletions

diff --git a/glow/src/quad.rs b/glow/src/quad.rs
index 75740c7e..e965f3c9 100644
--- a/glow/src/quad.rs
+++ b/glow/src/quad.rs
@@ -13,14 +13,22 @@ pub enum Pipeline {
 }
 
 impl Pipeline {
-    pub fn new(gl: &glow::Context) -> Pipeline {
+    pub fn new(
+        gl: &glow::Context,
+        shader_version: &(String, String),
+    ) -> Pipeline {
         let version = gl.version();
-        if version.is_embedded || version.major == 2 {
-            log::info!("Mode: compatibility");
-            Pipeline::Compatibility(compatibility::Pipeline::new(gl))
-        } else {
+
+        // OpenGL 3.0+ and OpenGL ES 3.0+ have instancing (which is what separates `core` from `compatibility`)
+        if version.major >= 3 {
             log::info!("Mode: core");
-            Pipeline::Core(core::Pipeline::new(gl))
+            Pipeline::Core(core::Pipeline::new(gl, shader_version))
+        } else {
+            log::info!("Mode: compatibility");
+            Pipeline::Compatibility(compatibility::Pipeline::new(
+                gl,
+                shader_version,
+            ))
         }
     }