comparison src/share/native/sun/java2d/opengl/OGLContext.h @ 13489:c8bb92cfa42d

Restore bsd specific iconv make flags lost in merge conflict.
author Kurt Miller <kurt@intricatesoftware.com>
date Mon, 11 Feb 2019 09:23:48 -0500
parents 7c7758fec30c
children
comparison
equal deleted inserted replaced
6:1ded62f85d27 7:ba8092b798fb
132 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER 132 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER
133 #define CAPS_EXT_GRAD_SHADER \ 133 #define CAPS_EXT_GRAD_SHADER \
134 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER 134 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER
135 #define CAPS_EXT_TEXRECT \ 135 #define CAPS_EXT_TEXRECT \
136 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT 136 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT
137 #define CAPS_EXT_TEXBARRIER \
138 sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXBARRIER
137 139
138 /** 140 /**
139 * Evaluates to true if the given capability bitmask is present for the 141 * Evaluates to true if the given capability bitmask is present for the
140 * given OGLContext. Note that only the constant name needs to be passed as 142 * given OGLContext. Note that only the constant name needs to be passed as
141 * a parameter, as this macro will automatically prepend the full package 143 * a parameter, as this macro will automatically prepend the full package