Some more cleanup of includes and forward declarations

[libs/gl.git] / source / glsl / features.h

diff --git a/source/glsl/features.h b/source/glsl/features.h
index 36220eb352fc0e097dfa1a2ddcae378a10e6073f..ca74d38abd3d2a2927420589f21af83ac21ea5b6 100644 (file)
--- a/source/glsl/features.h
+++ b/source/glsl/features.h
@@ -1,7 +1,7 @@
 #ifndef MSP_GL_SL_FEATURES_H_
 #define MSP_GL_SL_FEATURES_H_
 
-#include <msp/gl/extension.h>
+#include <msp/gl/backend.h>
 
 namespace Msp {
 namespace GL {
@@ -9,7 +9,7 @@ namespace SL {
 
 struct Features
 {
-       GLApi gl_api;
+       GraphicsApi target_api;
        Version glsl_version;
        bool arb_enhanced_layouts;
        bool arb_explicit_attrib_location;
@@ -20,11 +20,13 @@ struct Features
        bool ext_gpu_shader4;
        bool ext_texture_array;
        unsigned constant_id_range;
+       unsigned uniform_binding_range;
+       unsigned texture_binding_range;
 
        Features();
 
-       static Features from_context();
-       static Features all();
+       static Features from_version(const Version &);
+       static Features latest();
 };
 
 } // namespace SL