projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8293be3
)
Rename colour_conversion -> xyz_rec709_colour_conversion.
author
Carl Hetherington
<cth@carlh.net>
Mon, 17 Oct 2022 20:22:11 +0000
(22:22 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 18 Oct 2022 18:25:57 +0000
(20:25 +0200)
src/wx/gl_video_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/gl_video_view.cc
b/src/wx/gl_video_view.cc
index 1f60af69d6b4d0b99d11e667eaf2521d681ed7a0..efafe6548504d7405f4bfc978d5b775cf00a1ac2 100644
(file)
--- a/
src/wx/gl_video_view.cc
+++ b/
src/wx/gl_video_view.cc
@@
-203,7
+203,7
@@
static constexpr char fragment_source[] =
"uniform int type = 0;\n"
"uniform vec4 outline_content_colour;\n"
"uniform vec4 crop_guess_colour;\n"
"uniform int type = 0;\n"
"uniform vec4 outline_content_colour;\n"
"uniform vec4 crop_guess_colour;\n"
-"uniform mat4 colour_conversion;\n"
+"uniform mat4
xyz_rec709_
colour_conversion;\n"
"\n"
"out vec4 FragColor;\n"
"\n"
"\n"
"out vec4 FragColor;\n"
"\n"
@@
-271,7
+271,7
@@
static constexpr char fragment_source[] =
" FragColor.x = pow(FragColor.x, IN_GAMMA) / DCI_COEFFICIENT;\n"
" FragColor.y = pow(FragColor.y, IN_GAMMA) / DCI_COEFFICIENT;\n"
" FragColor.z = pow(FragColor.z, IN_GAMMA) / DCI_COEFFICIENT;\n"
" FragColor.x = pow(FragColor.x, IN_GAMMA) / DCI_COEFFICIENT;\n"
" FragColor.y = pow(FragColor.y, IN_GAMMA) / DCI_COEFFICIENT;\n"
" FragColor.z = pow(FragColor.z, IN_GAMMA) / DCI_COEFFICIENT;\n"
-" FragColor = colour_conversion * FragColor;\n"
+" FragColor =
xyz_rec709_
colour_conversion * FragColor;\n"
" FragColor.x = pow(FragColor.x, OUT_GAMMA);\n"
" FragColor.y = pow(FragColor.y, OUT_GAMMA);\n"
" FragColor.z = pow(FragColor.z, OUT_GAMMA);\n"
" FragColor.x = pow(FragColor.x, OUT_GAMMA);\n"
" FragColor.y = pow(FragColor.y, OUT_GAMMA);\n"
" FragColor.z = pow(FragColor.z, OUT_GAMMA);\n"
@@
-462,9
+462,9
@@
GLVideoView::setup_shaders ()
0.0f, 0.0f, 0.0f, 1.0f
};
0.0f, 0.0f, 0.0f, 1.0f
};
- auto
colour_conversion = glGetUniformLocation (program, "
colour_conversion");
+ auto
xyz_rec709_colour_conversion = glGetUniformLocation(program, "xyz_rec709_
colour_conversion");
check_gl_error ("glGetUniformLocation");
check_gl_error ("glGetUniformLocation");
- glUniformMatrix4fv
(
colour_conversion, 1, GL_TRUE, gl_matrix);
+ glUniformMatrix4fv
(xyz_rec709_
colour_conversion, 1, GL_TRUE, gl_matrix);
glLineWidth (1.0f);
check_gl_error ("glLineWidth");
glLineWidth (1.0f);
check_gl_error ("glLineWidth");