Skip to content

Commit

Permalink
fix some matrix stuff in maister's NTSC
Browse files Browse the repository at this point in the history
  • Loading branch information
@hunterk
hunterk committed Jun 12, 2018
1 parent 686c93c commit efb38a6
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 110 deletions.
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass1-composite-2phase.glsl
View file
Expand Up @@ -120,26 +120,25 @@ mat3 mix_mat = mat3(


// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass1-composite-3phase.glsl
View file
Expand Up @@ -119,26 +119,25 @@ mat3 mix_mat = mat3(


// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass1-svideo-2phase.glsl
View file
Expand Up @@ -118,26 +118,25 @@ mat3 mix_mat = mat3(
#endif

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass1-svideo-3phase.glsl
View file
Expand Up @@ -119,26 +119,25 @@ mat3 mix_mat = mat3(


// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-2phase-gamma.glsl
View file
Expand Up @@ -89,26 +89,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-2phase-linear.glsl
View file
Expand Up @@ -87,26 +87,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-2phase.glsl
View file
Expand Up @@ -85,26 +85,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-3phase-gamma.glsl
View file
Expand Up @@ -88,26 +88,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-3phase-linear.glsl
View file
Expand Up @@ -87,26 +87,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down
21 changes: 10 additions & 11 deletions ntsc/shaders/ntsc-pass2-3phase.glsl
View file
Expand Up @@ -85,26 +85,25 @@ COMPAT_VARYING vec4 TEX0;
#define outsize vec4(OutputSize, 1.0 / OutputSize)

// begin ntsc-rgbyuv
mat3 yiq2rgb_mat = mat3(
1.0, 1.0, 1.0,
0.956, -0.2720, -1.1060,
0.6210, -0.6474, 1.7046
);
const mat3 yiq2rgb_mat = mat3(
1.0, 0.956, 0.6210,
1.0, -0.2720, -0.6474,
1.0, -1.1060, 1.7046);

vec3 yiq2rgb(vec3 yiq)
{
return (yiq * yiq2rgb_mat);
return yiq * yiq2rgb_mat;
}

mat3 yiq_mat = mat3(
0.2989, 0.5959, 0.2115,
0.5870, -0.2744, -0.5229,
0.1140, -0.3216, 0.3114
const mat3 yiq_mat = mat3(
0.2989, 0.5870, 0.1140,
0.5959, -0.2744, -0.3216,
0.2115, -0.5229, 0.3114
);

vec3 rgb2yiq(vec3 col)
{
return (col * yiq_mat);
return col * yiq_mat;
}
// end ntsc-rgbyuv

Expand Down

0 comments on commit efb38a6

Please sign in to comment.