git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 21:53:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

png, gl_engine: fixed an wrong png colorspace.

Browse source 
issue: https://github.com/thorvg/thorvg/pull/2880
This commit is contained in:
Hermet Park 2024-10-19 12:50:04 +09:00
parent ec62ca869f
commit 3490f9b9ce
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/loaders/external_png/tvgPngLoader.cpp
View file

@ -86,10 +86,10 @@ bool PngLoader::read()
if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) {
image->format = PNG_FORMAT_BGRA;
surface.cs = ColorSpace::ARGB8888;
surface.cs = ColorSpace::ARGB8888S;
} else {
image->format = PNG_FORMAT_RGBA;
surface.cs = ColorSpace::ABGR8888;
surface.cs = ColorSpace::ABGR8888S;
}
auto buffer = static_cast<png_bytep>(malloc(PNG_IMAGE_SIZE((*image))));

2
src/loaders/png/tvgPngLoader.cpp
View file

@ -45,7 +45,7 @@ void PngLoader::run(unsigned tid)
surface.stride = width;
surface.w = width;
surface.h = height;
surface.cs = ColorSpace::ABGR8888;
surface.cs = ColorSpace::ABGR8888S;
surface.channelSize = sizeof(uint32_t);
}

22
src/renderer/gl_engine/tvgGlShaderSrc.cpp
View file

@ -276,30 +276,24 @@ const char* IMAGE_FRAG_SHADER = TVG_COMPOSE_SHADER(
int opacity; \n
int dummy; \n
} uColorInfo; \n
\n
uniform sampler2D uTexture; \n
\n
in vec2 vUV; \n
\n
out vec4 FragColor; \n
\n
void main() { \n
vec2 uv = vUV; \n
if (uColorInfo.flipY == 1) { uv.y = 1.0 - uv.y; } \n
\n
vec4 color = texture(uTexture, uv); \n
vec4 result = color; \n
if (uColorInfo.format == 1) { /* FMT_ARGB8888 */ \n
result.r = color.b * color.a; \n
result.g = color.g * color.a; \n
result.b = color.r * color.a; \n
result.a = color.a; \n
} else if (uColorInfo.format == 2) { /* FMT_ABGR8888S */ \n
vec4 result; \n
if (uColorInfo.format == 0) { /* FMT_ABGR8888 */ \n
result = color; \n
} else if (uColorInfo.format == 1) { /* FMT_ARGB8888 */ \n
result = color.bgra; \n
} else if (uColorInfo.format == 2) { /* FMT_ABGR8888S */ \n
result = vec4(color.rgb * color.a, color.a); \n
} else if (uColorInfo.format == 3) { /* FMT_ARGB8888S */ \n
result.r = color.b; \n
result.g = color.g; \n
result.b = color.b; \n
result.a = color.a; \n
result = vec4(color.bgr * color.a, color.a); \n
} \n
float opacity = float(uColorInfo.opacity) / 255.0; \n
FragColor = result * opacity; \n