encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 2595 - Padded, non-contiguous YUV does not display correctly using OpenGL ES 2.0 renderer 

Sylvain

Ok, I found out : GLES2_UpdateTexture is just not handling the YUV, I will attach a patch.
This commit is contained in:
Sam Lantinga 2014-06-25 00:58:40 -07:00
parent afe14829b8
commit b4deeeba05
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/render/opengles2/SDL_render_gles2.c
View File

@ -592,7 +592,7 @@ GLES2_TexSubImage2D(GLES2_DriverContext *data, GLenum target, GLint xoffset, GLi
/* Reformat the texture data into a tightly packed array */ /* Reformat the texture data into a tightly packed array */
src_pitch = width * bpp; src_pitch = width * bpp;
src = (Uint8 *) pixels; src = (Uint8 *)pixels;
if (pitch != src_pitch) { if (pitch != src_pitch) {
blob = (Uint8 *)SDL_malloc(src_pitch * height); blob = (Uint8 *)SDL_malloc(src_pitch * height);
if (!blob) { if (!blob) {
@ -639,6 +639,40 @@ GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect
tdata->pixel_type, tdata->pixel_type,
pixels, pitch, SDL_BYTESPERPIXEL(texture->format)); pixels, pitch, SDL_BYTESPERPIXEL(texture->format));
if (tdata->yuv) {
/* Skip to the correct offset into the next texture */
pixels = (const void*)((const Uint8*)pixels + rect->h * pitch);
if (texture->format == SDL_PIXELFORMAT_YV12) {
data->glBindTexture(tdata->texture_type, tdata->texture_v);
} else {
data->glBindTexture(tdata->texture_type, tdata->texture_u);
}
GLES2_TexSubImage2D(data, tdata->texture_type,
rect->x / 2,
rect->y / 2,
rect->w / 2,
rect->h / 2,
tdata->pixel_format,
tdata->pixel_type,
pixels, pitch / 2, 1);
/* Skip to the correct offset into the next texture */
pixels = (const void*)((const Uint8*)pixels + (rect->h * pitch)/4);
if (texture->format == SDL_PIXELFORMAT_YV12) {
data->glBindTexture(tdata->texture_type, tdata->texture_u);
} else {
data->glBindTexture(tdata->texture_type, tdata->texture_v);
}
GLES2_TexSubImage2D(data, tdata->texture_type,
rect->x / 2,
rect->y / 2,
rect->w / 2,
rect->h / 2,
tdata->pixel_format,
tdata->pixel_type,
pixels, pitch / 2, 1);
}
return GL_CheckError("glTexSubImage2D()", renderer); return GL_CheckError("glTexSubImage2D()", renderer);
} }
@ -686,7 +720,7 @@ GLES2_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
rect->h, rect->h,
tdata->pixel_format, tdata->pixel_format,
tdata->pixel_type, tdata->pixel_type,
Vplane, Vpitch, 1); Yplane, Ypitch, 1);
return GL_CheckError("glTexSubImage2D()", renderer); return GL_CheckError("glTexSubImage2D()", renderer);
} }