Commit b360965d0d349fc977bd73ba70c2e8c2c23544b3
2021-10-21T20:48:05
Added a hint for alternate OpenGL NV12 data format
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 80cfd09..6d68bc7 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -123,6 +123,7 @@ typedef struct
GLfloat texh;
GLenum format;
GLenum formattype;
+ GL_Shader shader;
void *pixels;
int pitch;
SDL_Rect locked_rect;
@@ -630,6 +631,57 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
}
#endif
+ if (texture->format == SDL_PIXELFORMAT_ABGR8888 || texture->format == SDL_PIXELFORMAT_ARGB8888) {
+ data->shader = SHADER_RGBA;
+ } else {
+ data->shader = SHADER_RGB;
+ }
+
+#if SDL_HAVE_YUV
+ if (data->yuv || data->nv12) {
+ switch (SDL_GetYUVConversionModeForResolution(texture->w, texture->h)) {
+ case SDL_YUV_CONVERSION_JPEG:
+ if (data->yuv) {
+ data->shader = SHADER_YUV_JPEG;
+ } else if (texture->format == SDL_PIXELFORMAT_NV12) {
+ data->shader = SHADER_NV12_JPEG;
+ } else {
+ data->shader = SHADER_NV21_JPEG;
+ }
+ break;
+ case SDL_YUV_CONVERSION_BT601:
+ if (data->yuv) {
+ data->shader = SHADER_YUV_BT601;
+ } else if (texture->format == SDL_PIXELFORMAT_NV12) {
+ if (SDL_GetHintBoolean("SDL_RENDER_OPENGL_NV12_RG_SHADER", SDL_FALSE)) {
+ data->shader = SHADER_NV12_RG_BT601;
+ } else {
+ data->shader = SHADER_NV12_RA_BT601;
+ }
+ } else {
+ data->shader = SHADER_NV21_BT601;
+ }
+ break;
+ case SDL_YUV_CONVERSION_BT709:
+ if (data->yuv) {
+ data->shader = SHADER_YUV_BT709;
+ } else if (texture->format == SDL_PIXELFORMAT_NV12) {
+ if (SDL_GetHintBoolean("SDL_RENDER_OPENGL_NV12_RG_SHADER", SDL_FALSE)) {
+ data->shader = SHADER_NV12_RG_BT709;
+ } else {
+ data->shader = SHADER_NV12_RA_BT709;
+ }
+ } else {
+ data->shader = SHADER_NV21_BT709;
+ }
+ break;
+ default:
+ SDL_assert(!"unsupported YUV conversion mode");
+ break;
+ }
+ }
+#endif /* SDL_HAVE_YUV */
+
return GL_CheckError("", renderer);
}
@@ -1186,54 +1238,8 @@ SetCopyState(GL_RenderData *data, const SDL_RenderCommand *cmd)
{
SDL_Texture *texture = cmd->data.draw.texture;
const GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
- GL_Shader shader;
-
- if (texture->format == SDL_PIXELFORMAT_ABGR8888 || texture->format == SDL_PIXELFORMAT_ARGB8888) {
- shader = SHADER_RGBA;
- } else {
- shader = SHADER_RGB;
- }
-
-#if SDL_HAVE_YUV
- if (data->shaders) {
- if (texturedata->yuv || texturedata->nv12) {
- switch (SDL_GetYUVConversionModeForResolution(texture->w, texture->h)) {
- case SDL_YUV_CONVERSION_JPEG:
- if (texturedata->yuv) {
- shader = SHADER_YUV_JPEG;
- } else if (texture->format == SDL_PIXELFORMAT_NV12) {
- shader = SHADER_NV12_JPEG;
- } else {
- shader = SHADER_NV21_JPEG;
- }
- break;
- case SDL_YUV_CONVERSION_BT601:
- if (texturedata->yuv) {
- shader = SHADER_YUV_BT601;
- } else if (texture->format == SDL_PIXELFORMAT_NV12) {
- shader = SHADER_NV12_BT601;
- } else {
- shader = SHADER_NV21_BT601;
- }
- break;
- case SDL_YUV_CONVERSION_BT709:
- if (texturedata->yuv) {
- shader = SHADER_YUV_BT709;
- } else if (texture->format == SDL_PIXELFORMAT_NV12) {
- shader = SHADER_NV12_BT709;
- } else {
- shader = SHADER_NV21_BT709;
- }
- break;
- default:
- SDL_assert(!"unsupported YUV conversion mode");
- break;
- }
- }
- }
-#endif
- SetDrawState(data, cmd, shader);
+ SetDrawState(data, cmd, texturedata->shader);
if (texture != data->drawstate.texture) {
const GLenum textype = data->textype;
diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index 23f708a..5b6aea4 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -149,7 +149,7 @@ struct GL_ShaderContext
"uniform sampler2D tex1; // U/V \n" \
"\n" \
-#define NV12_SHADER_BODY \
+#define NV12_RA_SHADER_BODY \
"\n" \
"void main()\n" \
"{\n" \
@@ -174,6 +174,31 @@ struct GL_ShaderContext
" gl_FragColor = vec4(rgb, 1.0) * v_color;\n" \
"}" \
+#define NV12_RG_SHADER_BODY \
+"\n" \
+"void main()\n" \
+"{\n" \
+" vec2 tcoord;\n" \
+" vec3 yuv, rgb;\n" \
+"\n" \
+" // Get the Y value \n" \
+" tcoord = v_texCoord;\n" \
+" yuv.x = texture2D(tex0, tcoord).r;\n" \
+"\n" \
+" // Get the U and V values \n" \
+" tcoord *= UVCoordScale;\n" \
+" yuv.yz = texture2D(tex1, tcoord).rg;\n" \
+"\n" \
+" // Do the color transform \n" \
+" yuv += offset;\n" \
+" rgb.r = dot(yuv, Rcoeff);\n" \
+" rgb.g = dot(yuv, Gcoeff);\n" \
+" rgb.b = dot(yuv, Bcoeff);\n" \
+"\n" \
+" // That was easy. :) \n" \
+" gl_FragColor = vec4(rgb, 1.0) * v_color;\n" \
+"}" \
+
#define NV21_SHADER_PROLOGUE \
"varying vec4 v_color;\n" \
"varying vec2 v_texCoord;\n" \
@@ -294,25 +319,43 @@ static const char *shader_source[NUM_SHADERS][2] =
/* fragment shader */
NV12_SHADER_PROLOGUE
JPEG_SHADER_CONSTANTS
- NV12_SHADER_BODY
+ NV12_RA_SHADER_BODY
+ },
+ /* SHADER_NV12_RA_BT601 */
+ {
+ /* vertex shader */
+ TEXTURE_VERTEX_SHADER,
+ /* fragment shader */
+ NV12_SHADER_PROLOGUE
+ BT601_SHADER_CONSTANTS
+ NV12_RA_SHADER_BODY
},
- /* SHADER_NV12_BT601 */
+ /* SHADER_NV12_RG_BT601 */
{
/* vertex shader */
TEXTURE_VERTEX_SHADER,
/* fragment shader */
NV12_SHADER_PROLOGUE
BT601_SHADER_CONSTANTS
- NV12_SHADER_BODY
+ NV12_RG_SHADER_BODY
+ },
+ /* SHADER_NV12_RA_BT709 */
+ {
+ /* vertex shader */
+ TEXTURE_VERTEX_SHADER,
+ /* fragment shader */
+ NV12_SHADER_PROLOGUE
+ BT709_SHADER_CONSTANTS
+ NV12_RA_SHADER_BODY
},
- /* SHADER_NV12_BT709 */
+ /* SHADER_NV12_RG_BT709 */
{
/* vertex shader */
TEXTURE_VERTEX_SHADER,
/* fragment shader */
NV12_SHADER_PROLOGUE
BT709_SHADER_CONSTANTS
- NV12_SHADER_BODY
+ NV12_RG_SHADER_BODY
},
/* SHADER_NV21_JPEG */
{
diff --git a/src/render/opengl/SDL_shaders_gl.h b/src/render/opengl/SDL_shaders_gl.h
index ece3ef8..0ccc13c 100644
--- a/src/render/opengl/SDL_shaders_gl.h
+++ b/src/render/opengl/SDL_shaders_gl.h
@@ -36,8 +36,10 @@ typedef enum {
SHADER_YUV_BT601,
SHADER_YUV_BT709,
SHADER_NV12_JPEG,
- SHADER_NV12_BT601,
- SHADER_NV12_BT709,
+ SHADER_NV12_RA_BT601,
+ SHADER_NV12_RG_BT601,
+ SHADER_NV12_RA_BT709,
+ SHADER_NV12_RG_BT709,
SHADER_NV21_JPEG,
SHADER_NV21_BT601,
SHADER_NV21_BT709,