fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 04:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[gl] Fix the color bits of CAIRO_CONTENT_ALPHA surface patterns to be 0.

Browse source 
Fixes surface-pattern-operator and alpha-similar.
This commit is contained in:
Eric Anholt 2010-01-14 10:05:02 -08:00
parent 520945603c
commit e26e2c8cc4
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo-gl-private.h
View file

@ -113,7 +113,6 @@ typedef struct cairo_gl_composite_operand {
GLuint tex; GLuint tex;
cairo_gl_surface_t *surface; cairo_gl_surface_t *surface;
cairo_surface_attributes_t attributes; cairo_surface_attributes_t attributes;
cairo_bool_t has_alpha;
} texture; } texture;
struct { struct {
GLfloat color[4]; GLfloat color[4];

22
src/cairo-gl-surface.c
View file

@ -954,15 +954,6 @@ _cairo_gl_pattern_texture_setup (cairo_gl_composite_operand_t *operand,
operand->operand.texture.surface = surface; operand->operand.texture.surface = surface;
operand->operand.texture.tex = surface->tex; operand->operand.texture.tex = surface->tex;
switch (surface->base.content) {
case CAIRO_CONTENT_ALPHA:
case CAIRO_CONTENT_COLOR_ALPHA:
operand->operand.texture.has_alpha = TRUE;
break;
case CAIRO_CONTENT_COLOR:
operand->operand.texture.has_alpha = FALSE;
break;
}
/* Translate the matrix from /* Translate the matrix from
* (unnormalized src -> unnormalized src) to * (unnormalized src -> unnormalized src) to
@ -1142,13 +1133,22 @@ _cairo_gl_set_src_operand (cairo_gl_context_t *ctx,
glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE); glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE0); /* Force the src color to 0 if the surface should be alpha-only.
* We may have a teximage with color bits if the implementation doesn't
* support GL_ALPHA FBOs.
*/
if (setup->src.operand.texture.surface->base.content !=
CAIRO_CONTENT_ALPHA)
glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE0);
else
glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_CONSTANT);
/* Wire the src alpha to 1 if the surface doesn't have it. /* Wire the src alpha to 1 if the surface doesn't have it.
* We may have a teximage with alpha bits even though we didn't ask * We may have a teximage with alpha bits even though we didn't ask
* for it and we don't pay attention to setting alpha to 1 in a dest * for it and we don't pay attention to setting alpha to 1 in a dest
* that has inadvertent alpha. * that has inadvertent alpha.
*/ */
if (setup->src.operand.texture.has_alpha) if (setup->src.operand.texture.surface->base.content !=
CAIRO_CONTENT_COLOR)
glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE0); glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE0);
else else
glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_CONSTANT); glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_CONSTANT);