mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2591 Repainting is broken (was: Icons in tree list widgets became dark)

Browse Source 
Save current blend mode before cached grayscale rendering

(cherry picked from commit 7beb75ccec)
(cherry picked from commit ed52fde57d)
(cherry picked from commit 1a46cd70af)
This commit is contained in:
Alexey Ushakov
2020-07-22 13:21:42 +03:00
committed by jbrbot
parent f38df17114
commit fde2ee36ad
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/java.desktop/share/native/common/java2d/opengl/OGLTextRenderer.c
View File

@@ -68,6 +68,13 @@ typedef enum {
} GlyphMode;
static GlyphMode glyphMode = MODE_NOT_INITED;
/**
* Current blending modes saved in OGLTR_EnableGrayGlyphModeState and restored in
* OGLTR_DisableGlyphModeState
*/
static GLint currentBlendSrc;
static GLint currentBlendDst;
/**
* There are two separate glyph caches: for AA and for LCD.
* Once one of them is initialized as either GRAY or LCD, it
@@ -575,8 +582,7 @@ OGLTR_EnableLCDGlyphModeState(GLuint glyphTextureID,
return JNI_TRUE;
}
/**
* Enables the GrayScale text shader and updates any related state, such as the
* gamma lookup table textures.
* Enables the GrayScale text shader and updates any related states
*/
static jboolean
OGLTR_EnableGrayGlyphModeState(GLuint glyphTextureID, jint contrast)
@@ -586,6 +592,9 @@ OGLTR_EnableGrayGlyphModeState(GLuint glyphTextureID, jint contrast)
j2d_glBindTexture(GL_TEXTURE_2D, glyphTextureID);
j2d_glEnable(GL_TEXTURE_2D);
j2d_glEnable(GL_BLEND);
j2d_glGetIntegerv(GL_BLEND_SRC_ALPHA, &currentBlendSrc);
j2d_glGetIntegerv(GL_BLEND_DST_ALPHA, &currentBlendDst);
j2d_glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
// create the Gray text shader, if necessary
@@ -668,11 +677,6 @@ OGLTR_DisableGlyphModeState()
j2d_glDisable(GL_TEXTURE_2D);
break;
case MODE_NO_CACHE_COLOR:
case MODE_NO_CACHE_GRAY:
j2d_glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
j2d_glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
/* FALLTHROUGH */
case MODE_USE_CACHE_GRAY:
OGLVertexCache_FlushVertexCache();
j2d_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
@@ -680,7 +684,11 @@ OGLTR_DisableGlyphModeState()
j2d_glUseProgramObjectARB(0);
j2d_glActiveTextureARB(GL_TEXTURE0_ARB);
j2d_glDisable(GL_TEXTURE_2D);
j2d_glBlendFunc(currentBlendSrc, currentBlendDst);
break;
case MODE_NO_CACHE_COLOR:
case MODE_NO_CACHE_GRAY:
/* FALLTHROUGH */
case MODE_NOT_INITED:
default:
break;