|
@@ -334,7 +334,7 @@ static void glnvg__blendFuncSeparate(GLNVGcontext* gl, const GLNVGblend* blend) |
|
|
(gl->blendFunc.dstRGB != blend->dstRGB) || |
|
|
(gl->blendFunc.dstRGB != blend->dstRGB) || |
|
|
(gl->blendFunc.srcAlpha != blend->srcAlpha) || |
|
|
(gl->blendFunc.srcAlpha != blend->srcAlpha) || |
|
|
(gl->blendFunc.dstAlpha != blend->dstAlpha)) { |
|
|
(gl->blendFunc.dstAlpha != blend->dstAlpha)) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
gl->blendFunc = *blend; |
|
|
gl->blendFunc = *blend; |
|
|
glBlendFuncSeparate(blend->srcRGB, blend->dstRGB, blend->srcAlpha,blend->dstAlpha); |
|
|
glBlendFuncSeparate(blend->srcRGB, blend->dstRGB, blend->srcAlpha,blend->dstAlpha); |
|
|
} |
|
|
} |
|
@@ -626,6 +626,7 @@ static int glnvg__renderCreate(void* uptr) |
|
|
" float scissor = scissorMask(fpos);\n" |
|
|
" float scissor = scissorMask(fpos);\n" |
|
|
"#ifdef EDGE_AA\n" |
|
|
"#ifdef EDGE_AA\n" |
|
|
" float strokeAlpha = strokeMask();\n" |
|
|
" float strokeAlpha = strokeMask();\n" |
|
|
|
|
|
" if (strokeAlpha < strokeThr) discard;\n" |
|
|
"#else\n" |
|
|
"#else\n" |
|
|
" float strokeAlpha = 1.0;\n" |
|
|
" float strokeAlpha = 1.0;\n" |
|
|
"#endif\n" |
|
|
"#endif\n" |
|
@@ -665,9 +666,6 @@ static int glnvg__renderCreate(void* uptr) |
|
|
" color *= scissor;\n" |
|
|
" color *= scissor;\n" |
|
|
" result = color * innerCol;\n" |
|
|
" result = color * innerCol;\n" |
|
|
" }\n" |
|
|
" }\n" |
|
|
"#ifdef EDGE_AA\n" |
|
|
|
|
|
" if (strokeAlpha < strokeThr) discard;\n" |
|
|
|
|
|
"#endif\n" |
|
|
|
|
|
"#ifdef NANOVG_GL3\n" |
|
|
"#ifdef NANOVG_GL3\n" |
|
|
" outColor = result;\n" |
|
|
" outColor = result;\n" |
|
|
"#else\n" |
|
|
"#else\n" |
|
|