frodovdr
/
vdr-plugin-softhdcuvid
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Some refactoring of shaders

This commit is contained in:
jojo61 2019-12-23 14:53:30 +01:00
parent 463109fcb6
commit 68fa4fe4dc
2 changed files with 57 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
openglosd.cpp
View File

@ -21,107 +21,17 @@ void ConvertColor(const GLint &colARGB, glm::vec4 &col) {
****************************************************************************************/ ****************************************************************************************/
#ifdef CUVID #ifdef CUVID
const char *rectVertexShader = const char *glversion = "#version 330 core ";
"#version 330 core \n\
\
layout (location = 0) in vec2 position; \
out vec4 rectCol; \
uniform vec4 inColor; \
uniform mat4 projection; \
\
void main() \
{ \
gl_Position = projection * vec4(position.x, position.y, 0.0, 1.0); \
rectCol = inColor; \
} \
";
const char *rectFragmentShader =
"#version 330 core \n\
\
in vec4 rectCol; \
out vec4 color; \
\
void main() \
{ \
color = rectCol; \
} \
";
const char *textureVertexShader =
"#version 330 core \n\
\
layout (location = 0) in vec2 position; \
layout (location = 1) in vec2 texCoords; \
\
out vec2 TexCoords; \
out vec4 alphaValue;\
\
uniform mat4 projection; \
uniform vec4 alpha; \
\
void main() \
{ \
gl_Position = projection * vec4(position.x, position.y, 0.0, 1.0); \
TexCoords = texCoords; \
alphaValue = alpha; \
} \
";
const char *textureFragmentShader =
"#version 330 core \n\
in vec2 TexCoords; \
in vec4 alphaValue; \
out vec4 color; \
\
uniform sampler2D screenTexture; \
\
void main() \
{ \
color = texture(screenTexture, TexCoords) * alphaValue; \
} \
";
const char *textVertexShader =
"#version 330 core \n\
\
layout (location = 0) in vec2 position; \
layout (location = 1) in vec2 texCoords; \
\
out vec2 TexCoords; \
out vec4 textColor; \
\
uniform mat4 projection; \
uniform vec4 inColor; \
\
void main() \
{ \
gl_Position = projection * vec4(position.x, position.y, 0.0, 1.0); \
TexCoords = texCoords; \
textColor = inColor; \
} \
";
const char *textFragmentShader =
"#version 330 core \n\
in vec2 TexCoords; \
in vec4 textColor; \
\
out vec4 color; \
\
uniform sampler2D glyphTexture; \
\
void main() \
{ \
vec4 sampled = vec4(1.0, 1.0, 1.0, texture(glyphTexture, TexCoords).r); \
color = textColor * sampled; \
} \
";
#else #else
#ifdef RASPI
const char *glversion = "#version 300 es";
#else
const char *glversion = " ";
#endif
#endif
const char *rectVertexShader = const char *rectVertexShader =
"\n \ "%s\n \
\ \
layout (location = 0) in vec2 position; \ layout (location = 0) in vec2 position; \
out vec4 rectCol; \ out vec4 rectCol; \
@ -136,7 +46,7 @@ void main() \
"; ";
const char *rectFragmentShader = const char *rectFragmentShader =
"\n \ "%s\n \
\ \
precision mediump float; \ precision mediump float; \
in vec4 rectCol; \ in vec4 rectCol; \
@ -149,7 +59,7 @@ void main() \
"; ";
const char *textureVertexShader = const char *textureVertexShader =
"\n \ "%s\n \
\ \
layout (location = 0) in vec2 position; \ layout (location = 0) in vec2 position; \
layout (location = 1) in vec2 texCoords; \ layout (location = 1) in vec2 texCoords; \
@ -169,7 +79,7 @@ void main() \
"; ";
const char *textureFragmentShader = const char *textureFragmentShader =
"\n \ "%s\n \
precision mediump float; \ precision mediump float; \
in vec2 TexCoords; \ in vec2 TexCoords; \
in vec4 alphaValue; \ in vec4 alphaValue; \
@ -184,7 +94,7 @@ void main() \
"; ";
const char *textVertexShader = const char *textVertexShader =
"\n \ "%s\n \
\ \
layout (location = 0) in vec2 position; \ layout (location = 0) in vec2 position; \
layout (location = 1) in vec2 texCoords; \ layout (location = 1) in vec2 texCoords; \
@ -204,7 +114,7 @@ void main() \
"; ";
const char *textFragmentShader = const char *textFragmentShader =
"\n \ "%s\n \
precision mediump float; \ precision mediump float; \
in vec2 TexCoords; \ in vec2 TexCoords; \
in vec4 textColor; \ in vec4 textColor; \
@ -219,7 +129,7 @@ void main() \
color = textColor * sampled; \ color = textColor * sampled; \
} \ } \
"; ";
#endif
/// ///
/// GLX check error. /// GLX check error.
/// ///
@ -300,20 +210,27 @@ void cShader::SetMatrix4(const GLchar *name, const glm::mat4 &matrix) {
bool cShader::Compile(const char *vertexCode, const char *fragmentCode) { bool cShader::Compile(const char *vertexCode, const char *fragmentCode) {
GLuint sVertex, sFragment; GLuint sVertex, sFragment;
char *buffer = (char *)malloc(1000);
// Vertex Shader // Vertex Shader
sVertex = glCreateShader(GL_VERTEX_SHADER); sVertex = glCreateShader(GL_VERTEX_SHADER);
glShaderSource(sVertex, 1, &vertexCode, NULL); sprintf(buffer,vertexCode,glversion);
glShaderSource(sVertex, 1, (const GLchar**) &buffer, NULL);
glCompileShader(sVertex); glCompileShader(sVertex);
// esyslog("[softhddev]:SHADER:VERTEX %s\n",vertexCode); // esyslog("[softhddev]:SHADER:VERTEX %s\n",vertexCode);
if (!CheckCompileErrors(sVertex)) if (!CheckCompileErrors(sVertex)) {
free(buffer);
return false; return false;
}
// Fragment Shader // Fragment Shader
sFragment = glCreateShader(GL_FRAGMENT_SHADER); sFragment = glCreateShader(GL_FRAGMENT_SHADER);
glShaderSource(sFragment, 1, &fragmentCode, NULL); sprintf(buffer,fragmentCode,glversion);
glShaderSource(sFragment, 1, (const GLchar**)&buffer, NULL);
glCompileShader(sFragment); glCompileShader(sFragment);
// esyslog("[softhddev]:SHADER:FRAGMENT %s\n",fragmentCode); // esyslog("[softhddev]:SHADER:FRAGMENT %s\n",fragmentCode);
if (!CheckCompileErrors(sFragment)) if (!CheckCompileErrors(sFragment)) {
free(buffer);
return false; return false;
}
// link Program // link Program
id = glCreateProgram(); id = glCreateProgram();
glAttachShader(id, sVertex); glAttachShader(id, sVertex);
@ -324,6 +241,7 @@ bool cShader::Compile(const char *vertexCode, const char *fragmentCode) {
// Delete the shaders as they're linked into our program now and no longer necessery // Delete the shaders as they're linked into our program now and no longer necessery
glDeleteShader(sVertex); glDeleteShader(sVertex);
glDeleteShader(sFragment); glDeleteShader(sFragment);
free(buffer);
return true; return true;
} }

164
shaders.h
View File

@ -1,121 +1,17 @@
// shader // shader
#ifdef CUVID #ifdef CUVID
char vertex_osd[] = { "\ const char *gl_version = "#version 330";
#version 330\n\ #else
in vec2 vertex_position;\n\ #ifdef RASPI
in vec2 vertex_texcoord0;\n\ const char *gl_version = "#version 300 es";
out vec2 texcoord0;\n\ #else
void main() {\n\ const char *gl_version = " ";
gl_Position = vec4(vertex_position, 1.0, 1.0);\n\ #endif
texcoord0 = vertex_texcoord0;\n\
}\n" };
char fragment_osd[] = { "\
#version 330\n\
#define texture1D texture\n\
precision mediump float; \
layout(location = 0) out vec4 out_color;\n\
in vec2 texcoord0;\n\
uniform sampler2D texture0;\n\
void main() {\n\
vec4 color; \n\
color = vec4(texture(texture0, texcoord0));\n\
out_color = color;\n\
}\n" };
char vertex[] = { "\
#version 310 es\n\
in vec2 vertex_position;\n\
in vec2 vertex_texcoord0;\n\
out vec2 texcoord0;\n\
in vec2 vertex_texcoord1;\n\
out vec2 texcoord1;\n\
void main() {\n\
gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
texcoord0 = vertex_texcoord0;\n\
texcoord1 = vertex_texcoord1;\n\
}\n" };
char fragment[] = { "\
#version 310 es\n\
#define texture1D texture\n\
#define texture3D texture\n\
precision mediump float; \
layout(location = 0) out vec4 out_color;\n\
in vec2 texcoord0;\n\
in vec2 texcoord1;\n\
uniform mat3 colormatrix;\n\
uniform vec3 colormatrix_c;\n\
uniform sampler2D texture0;\n\
uniform sampler2D texture1;\n\
void main() {\n\
vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
color.r = 1.000000 * vec4(texture(texture0, texcoord0)).r;\n\
color.gb = 1.000000 * vec4(texture(texture1, texcoord1)).rg;\n\
// color conversion\n\
color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;\n\
color.a = 1.0;\n\
// color mapping\n\
out_color = color;\n\
}\n" };
char fragment_bt2100[] = { "\
#version 310 es\n \
#define texture1D texture\n\
#define texture3D texture\n\
precision mediump float; \
layout(location = 0) out vec4 out_color;\n\
in vec2 texcoord0;\n\
in vec2 texcoord1;\n\
uniform mat3 colormatrix;\n\
uniform vec3 colormatrix_c;\n\
uniform mat3 cms_matrix;\n\
uniform sampler2D texture0;\n\
uniform sampler2D texture1;\n\
//#define LUT_POS(x, lut_size) mix(0.5 / (lut_size), 1.0 - 0.5 / (lut_size), (x))\n\
void main() {\n\
vec4 color; // = vec4(0.0, 0.0, 0.0, 1.0);\n\
color.r = 1.003906 * vec4(texture(texture0, texcoord0)).r;\n\
color.gb = 1.003906 * vec4(texture(texture1, texcoord1)).rg;\n\
// color conversion\n\
color.rgb = mat3(colormatrix) * color.rgb + colormatrix_c;\n\
color.a = 1.0;\n\
// color mapping\n\
color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
color.rgb = pow(color.rgb, vec3(2.4));\n\
color.rgb = cms_matrix * color.rgb;\n\
color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
out_color = color;\n\
}\n" };
#endif #endif
#ifdef RASPI char vertex_3[] = {"\
char vertex_osd[] = {"\ %s\n\
#version 300 es\n\
in vec2 vertex_position;\n\
in vec2 vertex_texcoord0;\n\
out vec2 texcoord0;\n\
void main() {\n\
gl_Position = vec4(vertex_position, 1.0, 1.0);\n\
texcoord0 = vertex_texcoord0;\n\
}\n"};
char fragment_osd[] = {"\
#version 300 es\n\
#define texture1D texture\n\
precision mediump float; \
layout(location = 0) out vec4 out_color;\n\
in vec2 texcoord0;\n\
uniform sampler2D texture0;\n\
void main() {\n\
vec4 color; \n\
color = vec4(texture(texture0, texcoord0));\n\
out_color = color;\n\
}\n"};
char vertex[] = {"\
#version 300 es\n\
in vec2 vertex_position;\n\ in vec2 vertex_position;\n\
in vec2 vertex_texcoord0;\n\ in vec2 vertex_texcoord0;\n\
out vec2 texcoord0;\n\ out vec2 texcoord0;\n\
@ -130,8 +26,8 @@ texcoord1 = vertex_texcoord1;\n\
texcoord2 = vertex_texcoord1;\n\ texcoord2 = vertex_texcoord1;\n\
}\n"}; }\n"};
char fragment[] = {"\ char fragment_3[] = {"\
#version 300 es\n\ %s\n\
#define texture1D texture\n\ #define texture1D texture\n\
#define texture3D texture\n\ #define texture3D texture\n\
precision mediump float; \ precision mediump float; \
@ -157,8 +53,8 @@ color.a = 1.0;\n\
out_color = color;\n\ out_color = color;\n\
}\n"}; }\n"};
char fragment_bt2100[] = {"\ char fragment_bt2100_3[] = {"\
#version 300 es\n \ %s\n \
#define texture1D texture\n\ #define texture1D texture\n\
#define texture3D texture\n\ #define texture3D texture\n\
precision mediump float; \ precision mediump float; \
@ -189,10 +85,10 @@ color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\ color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
out_color = color;\n\ out_color = color;\n\
}\n"}; }\n"};
#endif
#if defined VAAPI && !defined RASPI
char vertex_osd[] = { "\ char vertex_osd[] = { "\
\n\ %s\n\
in vec2 vertex_position;\n\ in vec2 vertex_position;\n\
in vec2 vertex_texcoord0;\n\ in vec2 vertex_texcoord0;\n\
out vec2 texcoord0;\n\ out vec2 texcoord0;\n\
@ -202,7 +98,7 @@ texcoord0 = vertex_texcoord0;\n\
}\n" }; }\n" };
char fragment_osd[] = { "\ char fragment_osd[] = { "\
\n\ %s\n\
#define texture1D texture\n\ #define texture1D texture\n\
precision mediump float; \ precision mediump float; \
layout(location = 0) out vec4 out_color;\n\ layout(location = 0) out vec4 out_color;\n\
@ -215,7 +111,7 @@ out_color = color;\n\
}\n" }; }\n" };
char vertex[] = { "\ char vertex[] = { "\
\n\ %s\n\
in vec2 vertex_position;\n\ in vec2 vertex_position;\n\
in vec2 vertex_texcoord0;\n\ in vec2 vertex_texcoord0;\n\
out vec2 texcoord0;\n\ out vec2 texcoord0;\n\
@ -228,7 +124,7 @@ texcoord1 = vertex_texcoord1;\n\
}\n" }; }\n" };
char fragment[] = { "\ char fragment[] = { "\
\n\ %s\n\
#define texture1D texture\n\ #define texture1D texture\n\
#define texture3D texture\n\ #define texture3D texture\n\
precision mediump float; \ precision mediump float; \
@ -252,7 +148,7 @@ out_color = color;\n\
}\n" }; }\n" };
char fragment_bt2100[] = { "\ char fragment_bt2100[] = { "\
\n \ %s\n \
#define texture1D texture\n\ #define texture1D texture\n\
#define texture3D texture\n\ #define texture3D texture\n\
precision mediump float; \ precision mediump float; \
@ -280,7 +176,7 @@ color.rgb = clamp(color.rgb, 0.0, 1.0);\n\
color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\ color.rgb = pow(color.rgb, vec3(1.0/2.4));\n\
out_color = color;\n\ out_color = color;\n\
}\n" }; }\n" };
#endif
/* Color conversion matrix: RGB = m * YUV + c /* Color conversion matrix: RGB = m * YUV + c
* m is in row-major matrix, with m[row][col], e.g.: * m is in row-major matrix, with m[row][col], e.g.:
@ -382,9 +278,10 @@ static void compile_attach_shader(GLuint program, GLenum type, const char *sourc
GLint status, log_length; GLint status, log_length;
char log[4000]; char log[4000];
GLsizei len; GLsizei len;
char *buffer = (char *) malloc(1000);
sprintf(buffer,source,gl_version);
shader = glCreateShader(type); shader = glCreateShader(type);
glShaderSource(shader, 1, &source, NULL); glShaderSource(shader, 1, (const GLchar **)&buffer, NULL);
glCompileShader(shader); glCompileShader(shader);
status = 0; status = 0;
glGetShaderiv(shader, GL_COMPILE_STATUS, &status); glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
@ -396,6 +293,7 @@ static void compile_attach_shader(GLuint program, GLenum type, const char *sourc
glAttachShader(program, shader); glAttachShader(program, shader);
glDeleteShader(shader); glDeleteShader(shader);
free(buffer);
} }
static void link_shader(GLuint program) static void link_shader(GLuint program)
@ -439,27 +337,27 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
case AVCOL_SPC_RGB: case AVCOL_SPC_RGB:
m = &yuv_bt601.m[0][0]; m = &yuv_bt601.m[0][0];
c = &yuv_bt601.c[0]; c = &yuv_bt601.c[0];
frag = fragment; frag = Planes == 3?fragment_3:fragment;
Debug(3, "BT601 Colorspace used\n"); Debug(3, "BT601 Colorspace used\n");
break; break;
case AVCOL_SPC_BT709: case AVCOL_SPC_BT709:
case AVCOL_SPC_UNSPECIFIED: // comes with UHD case AVCOL_SPC_UNSPECIFIED: // comes with UHD
m = &yuv_bt709.m[0][0]; m = &yuv_bt709.m[0][0];
c = &yuv_bt709.c[0]; c = &yuv_bt709.c[0];
frag = fragment; frag = Planes==3?fragment_3:fragment;
Debug(3, "BT709 Colorspace used\n"); Debug(3, "BT709 Colorspace used\n");
break; break;
case AVCOL_SPC_BT2020_NCL: case AVCOL_SPC_BT2020_NCL:
m = &yuv_bt2020ncl.m[0][0]; m = &yuv_bt2020ncl.m[0][0];
c = &yuv_bt2020ncl.c[0]; c = &yuv_bt2020ncl.c[0];
cms = &cms_matrix[0][0]; cms = &cms_matrix[0][0];
frag = fragment_bt2100; frag = Planes == 3?fragment_bt2100_3:fragment_bt2100;
Debug(3, "BT2020NCL Colorspace used\n"); Debug(3, "BT2020NCL Colorspace used\n");
break; break;
default: // fallback default: // fallback
m = &yuv_bt709.m[0][0]; m = &yuv_bt709.m[0][0];
c = &yuv_bt709.c[0]; c = &yuv_bt709.c[0];
frag = fragment; frag = Planes==3?fragment_3:fragment;
Debug(3, "default BT709 Colorspace used %d\n", colorspace); Debug(3, "default BT709 Colorspace used %d\n", colorspace);
break; break;
} }
@ -467,7 +365,7 @@ static GLuint sc_generate(GLuint gl_prog, enum AVColorSpace colorspace)
Debug(3, "vor create\n"); Debug(3, "vor create\n");
gl_prog = glCreateProgram(); gl_prog = glCreateProgram();
Debug(3, "vor compile vertex\n"); Debug(3, "vor compile vertex\n");
compile_attach_shader(gl_prog, GL_VERTEX_SHADER, vertex); compile_attach_shader(gl_prog, GL_VERTEX_SHADER, Planes==3?vertex_3:vertex);
Debug(3, "vor compile fragment\n"); Debug(3, "vor compile fragment\n");
compile_attach_shader(gl_prog, GL_FRAGMENT_SHADER, frag); compile_attach_shader(gl_prog, GL_FRAGMENT_SHADER, frag);
glBindAttribLocation(gl_prog, 0, "vertex_position"); glBindAttribLocation(gl_prog, 0, "vertex_position");