X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.h;h=e10fab80759fd2359571fb6ff48d71a56d894aca;hp=fe76a7569976b80b690a8e3c2ed87f0078ab8a2d;hb=490f53088d8cc2bf9590f0822cbd7e8bc73be55a;hpb=20c2ca726f0e6c194a1fddcb9908796de19430ac diff --git a/effect.h b/effect.h index fe76a75..e10fab8 100644 --- a/effect.h +++ b/effect.h @@ -138,7 +138,7 @@ public: // Keeps the type of alpha (premultiplied, postmultiplied, blank) // unchanged from input to output. Usually appropriate if you // process all color channels in a linear fashion, do not change - // alpha, and do not produce any new pixels thare have alpha != 1.0. + // alpha, and do not produce any new pixels that have alpha != 1.0. // // Does not make sense for inputs. DONT_CARE_ALPHA_TYPE, @@ -316,11 +316,8 @@ protected: // // Neither of these take ownership of the pointer. - // int is special since GLSL pre-1.30 doesn't have integer uniforms. - // Thus, ints that you register will _not_ be converted to GLSL uniforms. + // These correspond directly to int/float/vec2/vec3/vec4 in GLSL. void register_int(const std::string &key, int *value); - - // These correspond directly to float/vec2/vec3/vec4 in GLSL. void register_float(const std::string &key, float *value); void register_vec2(const std::string &key, float *values); void register_vec3(const std::string &key, float *values);