summaryrefslogtreecommitdiff
path: root/display
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-04-23 12:51:06 +0200
committerAlexander Larsson <alexl@redhat.com>2010-04-23 15:41:42 +0200
commitce4d7b746bffea5a051e6e28236c122ae9ba824a (patch)
tree73d9eacad5ec5b7cb69d11dc2e756a0f5a9de965 /display
parent041d23e8829dcc83514f4235374e70d80412c044 (diff)
Revert disabling of alpha blend from surfaces
Diffstat (limited to 'display')
-rw-r--r--display/surface.c30
1 files changed, 8 insertions, 22 deletions
diff --git a/display/surface.c b/display/surface.c
index fb10985..552b756 100644
--- a/display/surface.c
+++ b/display/surface.c
@@ -111,30 +111,16 @@ HBITMAP CreateDeviceBitmap(PDev *pdev, SIZEL size, ULONG format, QXLPHYSICAL *ph
goto out_error1;
}
- if (allocation_type == DEVICE_BITMAP_ALLOCATION_TYPE_SURF0) {
- if (!EngAssociateSurface((HSURF)surf, pdev->eng, HOOK_SYNCHRONIZE | HOOK_COPYBITS |
- HOOK_BITBLT | HOOK_TEXTOUT | HOOK_STROKEPATH | HOOK_STRETCHBLT |
- HOOK_STRETCHBLTROP | HOOK_TRANSPARENTBLT
+ if (!EngAssociateSurface((HSURF)surf, pdev->eng, HOOK_SYNCHRONIZE | HOOK_COPYBITS |
+ HOOK_BITBLT | HOOK_TEXTOUT | HOOK_STROKEPATH | HOOK_STRETCHBLT |
+ HOOK_STRETCHBLTROP | HOOK_TRANSPARENTBLT | HOOK_ALPHABLEND
#ifdef CALL_TEST
- | HOOK_PLGBLT | HOOK_FILLPATH | HOOK_STROKEANDFILLPATH | HOOK_LINETO |
- HOOK_GRADIENTFILL
+ | HOOK_PLGBLT | HOOK_FILLPATH | HOOK_STROKEANDFILLPATH | HOOK_LINETO |
+ HOOK_GRADIENTFILL
#endif
- )) {
- DEBUG_PRINT((pdev, 0, "%s: EngAssociateSurface failed\n", __FUNCTION__));
- goto out_error2;
- }
- } else {
- if (!EngAssociateSurface((HSURF)surf, pdev->eng, HOOK_SYNCHRONIZE | HOOK_COPYBITS |
- HOOK_BITBLT | HOOK_TEXTOUT | HOOK_STROKEPATH | HOOK_STRETCHBLT |
- HOOK_STRETCHBLTROP | HOOK_TRANSPARENTBLT | HOOK_ALPHABLEND
- #ifdef CALL_TEST
- | HOOK_PLGBLT | HOOK_FILLPATH | HOOK_STROKEANDFILLPATH | HOOK_LINETO |
- HOOK_GRADIENTFILL
- #endif
- )) {
- DEBUG_PRINT((pdev, 0, "%s: EngAssociateSurface failed\n", __FUNCTION__));
- goto out_error2;
- }
+ )) {
+ DEBUG_PRINT((pdev, 0, "%s: EngAssociateSurface failed\n", __FUNCTION__));
+ goto out_error2;
}
pdev->surfaces_info[surface_id].pdev = pdev;