X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=widgets.cpp;h=66ec7c5c9ab932c6dbeaf7e02fb007e7fad87489;hp=529d902e878443c704ae5721a78aa1f4df40b34b;hb=825c90789c229f502520bf0b665596d473f2636d;hpb=e0811ddf51aeb50575fb5f7d9c6e32b92a6bac0d diff --git a/widgets.cpp b/widgets.cpp index 529d902..66ec7c5 100644 --- a/widgets.cpp +++ b/widgets.cpp @@ -1,12 +1,17 @@ #include #include +#include +#include + #include "resource_pool.h" #include "widgets.h" #include "util.h" #define HSV_WHEEL_SIZE 128 +using namespace std; + namespace movit { GLuint hsv_wheel_texnum = 0; @@ -188,12 +193,15 @@ void make_hsv_wheel_texture() void init_hsv_resources() { + vector frag_shader_outputs; textured_program_num = resource_pool.compile_glsl_program( read_version_dependent_file("vs", "vert"), - read_version_dependent_file("texture1d", "frag")); + read_version_dependent_file("texture1d", "frag"), + frag_shader_outputs); colored_program_num = resource_pool.compile_glsl_program( read_version_dependent_file("vs-color", "vert"), - read_version_dependent_file("color", "frag")); + read_version_dependent_file("color", "frag"), + frag_shader_outputs); make_hsv_wheel_texture(); }