LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-19 12:14:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update SDL2 to latest hg (fbfacc66c65c)

Browse Source
This commit is contained in:
Alex Szpakowski
2018-03-31 20:56:14 -03:00
parent ec93b28a5b
commit 768e2a7810
902 changed files with 22628 additions and 11545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SDL2/src/render/opengl/SDL_render_gl.c
+33 -11
View File
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -260,10 +260,8 @@ GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file,
#if 0
#define GL_CheckError(prefix, renderer)
#elif defined(_MSC_VER) || defined(__WATCOMC__)
#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __FUNCTION__)
#else
#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __PRETTY_FUNCTION__)
#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, SDL_FILE, SDL_LINE, SDL_FUNCTION)
#endif
static int
@@ -1349,13 +1347,37 @@ GL_SetupCopy(SDL_Renderer * renderer, SDL_Texture * texture)
GL_SetBlendMode(data, texture->blendMode);
if (texturedata->yuv) {
GL_SetShader(data, SHADER_YUV);
} else if (texturedata->nv12) {
if (texture->format == SDL_PIXELFORMAT_NV12) {
GL_SetShader(data, SHADER_NV12);
} else {
GL_SetShader(data, SHADER_NV21);
if (texturedata->yuv || texturedata->nv12) {
switch (SDL_GetYUVConversionModeForResolution(texture->w, texture->h)) {
case SDL_YUV_CONVERSION_JPEG:
if (texturedata->yuv) {
GL_SetShader(data, SHADER_YUV_JPEG);
} else if (texture->format == SDL_PIXELFORMAT_NV12) {
GL_SetShader(data, SHADER_NV12_JPEG);
} else {
GL_SetShader(data, SHADER_NV21_JPEG);
}
break;
case SDL_YUV_CONVERSION_BT601:
if (texturedata->yuv) {
GL_SetShader(data, SHADER_YUV_BT601);
} else if (texture->format == SDL_PIXELFORMAT_NV12) {
GL_SetShader(data, SHADER_NV12_BT601);
} else {
GL_SetShader(data, SHADER_NV21_BT601);
}
break;
case SDL_YUV_CONVERSION_BT709:
if (texturedata->yuv) {
GL_SetShader(data, SHADER_YUV_BT709);
} else if (texture->format == SDL_PIXELFORMAT_NV12) {
GL_SetShader(data, SHADER_NV12_BT709);
} else {
GL_SetShader(data, SHADER_NV21_BT709);
}
break;
default:
return SDL_SetError("Unsupported YUV conversion mode");
}
} else {
GL_SetShader(data, SHADER_RGB);