projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arch bld deps, opus bld fix, add render beep, shortcut filebox ctrl a/z, batchrender...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
playback3d.h
diff --git
a/cinelerra-5.1/cinelerra/playback3d.h
b/cinelerra-5.1/cinelerra/playback3d.h
index 314f392a30c19ab976b6726f2d5c3d597364a11b..2139ba7ba7ec9e52e58469c6c90a295f74c16d67 100644
(file)
--- a/
cinelerra-5.1/cinelerra/playback3d.h
+++ b/
cinelerra-5.1/cinelerra/playback3d.h
@@
-42,30
+42,38
@@
// use static presets YUV in bccolors.h
#define BC_GL_MATRIX(shader, mat) \
// use static presets YUV in bccolors.h
#define BC_GL_MATRIX(shader, mat) \
- glUniformMatrix3fv(glGetUniformLocation(shader, #mat), 1, 0, YUV::mat)
+ glUniformMatrix3fv(glGetUniformLocation(shader, #mat), 1, 1, YUV::mat)
+#define BC_GL_VECTOR(shader, vec) \
+ glUniform3fv(glGetUniformLocation(shader, #vec), 1, YUV::vec)
-#define BC_GL_YMINF(shader
,mat
) \
- glUniform1f(glGetUniformLocation(shader, "yminf"), YUV::
mat[9]
)
+#define BC_GL_YMINF(shader) \
+ glUniform1f(glGetUniformLocation(shader, "yminf"), YUV::
yuv.get_yminf()
)
#define BC_GL_RGB_TO_YUV(shader) do { \
BC_GL_MATRIX(shader, rgb_to_yuv_matrix); \
#define BC_GL_RGB_TO_YUV(shader) do { \
BC_GL_MATRIX(shader, rgb_to_yuv_matrix); \
- BC_GL_YMINF(shader, rgb_to_yuv_matrix); \
+ BC_GL_YMINF(shader); \
+} while(0)
+
+#define BC_GL_RGB_TO_Y(shader) do { \
+ BC_GL_VECTOR(shader, rgb_to_y_vector); \
+ BC_GL_YMINF(shader); \
} while(0)
#define BC_GL_YUV_TO_RGB(shader) do { \
BC_GL_MATRIX(shader, yuv_to_rgb_matrix); \
} while(0)
#define BC_GL_YUV_TO_RGB(shader) do { \
BC_GL_MATRIX(shader, yuv_to_rgb_matrix); \
- BC_GL_YMINF(shader
, yuv_to_rgb_matrix
); \
+ BC_GL_YMINF(shader); \
} while(0)
#define BC_GL_COLORS(shader) do { \
BC_GL_MATRIX(shader, yuv_to_rgb_matrix); \
BC_GL_MATRIX(shader, rgb_to_yuv_matrix); \
} while(0)
#define BC_GL_COLORS(shader) do { \
BC_GL_MATRIX(shader, yuv_to_rgb_matrix); \
BC_GL_MATRIX(shader, rgb_to_yuv_matrix); \
- BC_GL_YMINF(shader
, rgb_to_yuv_matrix
); \
+ BC_GL_YMINF(shader); \
} while(0)
#define bc_gl_yuv_to_rgb "uniform mat3 yuv_to_rgb_matrix;\n"
#define bc_gl_rgb_to_yuv "uniform mat3 rgb_to_yuv_matrix;\n"
} while(0)
#define bc_gl_yuv_to_rgb "uniform mat3 yuv_to_rgb_matrix;\n"
#define bc_gl_rgb_to_yuv "uniform mat3 rgb_to_yuv_matrix;\n"
+#define bc_gl_rgb_to_y "uniform vec3 rgb_to_y_vector;\n"
#define bc_gl_yminf "uniform float yminf;\n"
#define bc_gl_colors bc_gl_yuv_to_rgb bc_gl_rgb_to_yuv bc_gl_yminf
#define bc_gl_yminf "uniform float yminf;\n"
#define bc_gl_colors bc_gl_yuv_to_rgb bc_gl_rgb_to_yuv bc_gl_yminf