glamor: glamor_set_alu should enable GL_COLOR_LOGIC_OP.
GL_COLOR_OP seems not supported in current MESA.
This commit is contained in:
parent
f871d174a8
commit
8593f22fb8
|
@ -117,12 +117,10 @@ void
|
||||||
glamor_set_alu(unsigned char alu)
|
glamor_set_alu(unsigned char alu)
|
||||||
{
|
{
|
||||||
if (alu == GXcopy) {
|
if (alu == GXcopy) {
|
||||||
glDisable(GL_LOGIC_OP);
|
glDisable(GL_COLOR_LOGIC_OP);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
glEnable(GL_COLOR_LOGIC_OP);
|
||||||
glEnable(GL_LOGIC_OP);
|
|
||||||
|
|
||||||
switch (alu) {
|
switch (alu) {
|
||||||
case GXclear:
|
case GXclear:
|
||||||
glLogicOp(GL_CLEAR);
|
glLogicOp(GL_CLEAR);
|
||||||
|
@ -271,10 +269,10 @@ glamor_get_color_4f_from_pixel(PixmapPtr pixmap, unsigned long fg_pixel,
|
||||||
break;
|
break;
|
||||||
case 24:
|
case 24:
|
||||||
case 32:
|
case 32:
|
||||||
color[0] = ubyte_to_float(fg_pixel >> 16);
|
color[0] = ubyte_to_float((fg_pixel >> 16) & 0xFF);
|
||||||
color[1] = ubyte_to_float(fg_pixel >> 8);
|
color[1] = ubyte_to_float((fg_pixel >> 8) & 0xFF);
|
||||||
color[2] = ubyte_to_float(fg_pixel >> 0);
|
color[2] = ubyte_to_float((fg_pixel >> 0) & 0xFF);
|
||||||
color[3] = ubyte_to_float(fg_pixel >> 24);
|
color[3] = ubyte_to_float((fg_pixel >> 24) & 0xFF);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ErrorF("pixmap with bad depth: %d\n", pixmap->drawable.depth);
|
ErrorF("pixmap with bad depth: %d\n", pixmap->drawable.depth);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user