projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the OpenGL XYZ -> RGB gammas the right way round (#2294).
[dcpomatic.git]
/
src
/
wx
/
gl_video_view.cc
diff --git
a/src/wx/gl_video_view.cc
b/src/wx/gl_video_view.cc
index e912ae924df23f7555c43190bdb8545dbd78d6d2..284624372fc7df7ac346054b97ec53fed2d1c170 100644
(file)
--- a/
src/wx/gl_video_view.cc
+++ b/
src/wx/gl_video_view.cc
@@
-209,8
+209,8
@@
static constexpr char fragment_source[] =
"\n"
"vec4 cubic(float x)\n"
"\n"
"\n"
"vec4 cubic(float x)\n"
"\n"
-"#define IN_GAMMA 2.
2
\n"
-"#define OUT_GAMMA 0.
384615385\n" // 1 / 2.6
+"#define IN_GAMMA 2.
6
\n"
+"#define OUT_GAMMA 0.
454545455\n" // 1 / 2.2
"#define DCI_COEFFICIENT 0.91655528\n" // 48 / 53.37
"\n"
"{\n"
"#define DCI_COEFFICIENT 0.91655528\n" // 48 / 53.37
"\n"
"{\n"
@@
-466,7
+466,7
@@
GLVideoView::setup_shaders ()
check_gl_error ("glGetUniformLocation");
glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix);
check_gl_error ("glGetUniformLocation");
glUniformMatrix4fv (colour_conversion, 1, GL_TRUE, gl_matrix);
- glLineWidth (
2
.0f);
+ glLineWidth (
1
.0f);
check_gl_error ("glLineWidth");
glEnable (GL_BLEND);
check_gl_error ("glEnable");
check_gl_error ("glLineWidth");
glEnable (GL_BLEND);
check_gl_error ("glEnable");