OSDN Git Service

321
[psychlops/cpp.git] / psychlops / extension / standard / shader / psychlops_g_shader_fig.h
index fb53ae6..530a061 100644 (file)
@@ -16,7 +16,7 @@ namespace Psychlops {
 
        class ShaderInterface {
                public:
-               enum Version { AUTO_DETECT, GLSL1_1 };
+               enum Version { THROUGH, AUTO_DETECT, GLSL1_1, GLSL3_3 };
                static void reparseGLSL1_1(const std::string &source, std::string &result, std::vector<std::string> &args);
        };
 
@@ -26,7 +26,8 @@ namespace Figures {
        protected:
                Shader api;
                bool initialized;
-       public:
+       public:\r
+               ShaderInterface::Version glslversion;
                std::string orig_source;
                std::vector<std::string> orig_args;
                double arg_tmp[16];
@@ -66,7 +67,8 @@ namespace Figures {
 
                Shader api;
                bool initialized;
-       public:
+       public:\r
+               ShaderInterface::Version glslversion;
                std::string orig_source;
                std::vector<std::string> orig_args;
                double arg_tmp[16];