geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a hint for alternate OpenGL NV12 data format

main
Sam Lantinga 2021-10-21 20:48:05 -07:00
parent 6c134cf148
commit b360965d0d
3 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/render/opengl/SDL_render_gl.c
View File

@ -123,6 +123,7 @@ typedef struct
GLfloat texh; GLfloat texh;
GLenum format; GLenum format;
GLenum formattype; GLenum formattype;
GL_Shader shader;
void *pixels; void *pixels;
int pitch; int pitch;
SDL_Rect locked_rect; SDL_Rect locked_rect;
@ -630,6 +631,57 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
} }
#endif #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); return GL_CheckError("", renderer);
} }
@ -1186,54 +1238,8 @@ SetCopyState(GL_RenderData *data, const SDL_RenderCommand *cmd)
{ {
SDL_Texture *texture = cmd->data.draw.texture; SDL_Texture *texture = cmd->data.draw.texture;
const GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata; const GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
GL_Shader shader;
if (texture->format == SDL_PIXELFORMAT_ABGR8888 || texture->format == SDL_PIXELFORMAT_ARGB8888) { SetDrawState(data, cmd, texturedata->shader);
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);
if (texture != data->drawstate.texture) { if (texture != data->drawstate.texture) {
const GLenum textype = data->textype; const GLenum textype = data->textype;

55
src/render/opengl/SDL_shaders_gl.c
View File

@ -149,7 +149,7 @@ struct GL_ShaderContext
"uniform sampler2D tex1; // U/V \n" \ "uniform sampler2D tex1; // U/V \n" \
"\n" \ "\n" \
#define NV12_SHADER_BODY \ #define NV12_RA_SHADER_BODY \
"\n" \ "\n" \
"void main()\n" \ "void main()\n" \
"{\n" \ "{\n" \
@ -174,6 +174,31 @@ struct GL_ShaderContext
" gl_FragColor = vec4(rgb, 1.0) * v_color;\n" \ " 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 \ #define NV21_SHADER_PROLOGUE \
"varying vec4 v_color;\n" \ "varying vec4 v_color;\n" \
"varying vec2 v_texCoord;\n" \ "varying vec2 v_texCoord;\n" \
@ -294,25 +319,43 @@ static const char *shader_source[NUM_SHADERS][2] =
/* fragment shader */ /* fragment shader */
NV12_SHADER_PROLOGUE NV12_SHADER_PROLOGUE
JPEG_SHADER_CONSTANTS JPEG_SHADER_CONSTANTS
NV12_SHADER_BODY NV12_RA_SHADER_BODY
}, },
/* SHADER_NV12_BT601 */ /* SHADER_NV12_RA_BT601 */
{ {
/* vertex shader */ /* vertex shader */
TEXTURE_VERTEX_SHADER, TEXTURE_VERTEX_SHADER,
/* fragment shader */ /* fragment shader */
NV12_SHADER_PROLOGUE NV12_SHADER_PROLOGUE
BT601_SHADER_CONSTANTS BT601_SHADER_CONSTANTS
NV12_SHADER_BODY NV12_RA_SHADER_BODY
}, },
/* SHADER_NV12_BT709 */ /* SHADER_NV12_RG_BT601 */
{
/* vertex shader */
TEXTURE_VERTEX_SHADER,
/* fragment shader */
NV12_SHADER_PROLOGUE
BT601_SHADER_CONSTANTS
NV12_RG_SHADER_BODY
},
/* SHADER_NV12_RA_BT709 */
{ {
/* vertex shader */ /* vertex shader */
TEXTURE_VERTEX_SHADER, TEXTURE_VERTEX_SHADER,
/* fragment shader */ /* fragment shader */
NV12_SHADER_PROLOGUE NV12_SHADER_PROLOGUE
BT709_SHADER_CONSTANTS BT709_SHADER_CONSTANTS
NV12_SHADER_BODY NV12_RA_SHADER_BODY
},
/* SHADER_NV12_RG_BT709 */
{
/* vertex shader */
TEXTURE_VERTEX_SHADER,
/* fragment shader */
NV12_SHADER_PROLOGUE
BT709_SHADER_CONSTANTS
NV12_RG_SHADER_BODY
}, },
/* SHADER_NV21_JPEG */ /* SHADER_NV21_JPEG */
{ {

6
src/render/opengl/SDL_shaders_gl.h
View File

@ -36,8 +36,10 @@ typedef enum {
SHADER_YUV_BT601, SHADER_YUV_BT601,
SHADER_YUV_BT709, SHADER_YUV_BT709,
SHADER_NV12_JPEG, SHADER_NV12_JPEG,
SHADER_NV12_BT601, SHADER_NV12_RA_BT601,
SHADER_NV12_BT709, SHADER_NV12_RG_BT601,
SHADER_NV12_RA_BT709,
SHADER_NV12_RG_BT709,
SHADER_NV21_JPEG, SHADER_NV21_JPEG,
SHADER_NV21_BT601, SHADER_NV21_BT601,
SHADER_NV21_BT709, SHADER_NV21_BT709,