diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-08-10 21:55:15 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-01-19 14:02:31 +0000 |
| commit | 8385c426f86e9955e9e570a46f75bddd3c10ca01 (patch) | |
| tree | aedb4e633c840629f1abb6e43fc5d85c48e84be2 | |
| parent | 981ad1f364cf4fe8008c0f3592eb0f73dd14a118 (diff) | |
Cygwin/X: Remove WIN_DIB_MAXIMUM_SIZE check
This is only relevant to pre-NT versions of Windows, which are all EOL.
Also, it's in the wrong place now as framebuffer can get resized.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/win.h | 3 | ||||
| -rw-r--r-- | hw/xwin/winshaddd.c | 13 | ||||
| -rw-r--r-- | hw/xwin/winshadddnl.c | 12 | ||||
| -rw-r--r-- | hw/xwin/winshadgdi.c | 12 |
4 files changed, 0 insertions, 40 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 2eea345e5..96a868e22 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -74,9 +74,6 @@ #endif #define WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH FALSE -#define WIN_DIB_MAXIMUM_SIZE 0x08000000 /* 16 MB on Windows 95, 98, Me */ -#define WIN_DIB_MAXIMUM_SIZE_MB (WIN_DIB_MAXIMUM_SIZE / 8 / 1024 / 1024) - /* * Windows only supports 256 color palettes */ diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index 45d15482c..e23e10067 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -949,19 +949,6 @@ winAdjustVideoModeShadowDD (ScreenPtr pScreen) /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; } - - /* See if the shadow bitmap will be larger than the DIB size limit */ - if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP - >= WIN_DIB_MAXIMUM_SIZE) - { - ErrorF ("winAdjustVideoModeShadowDD - Requested DirectDraw surface " - "will be larger than %d MB. The surface may fail to be " - "allocated on Windows 95, 98, or Me, due to a %d MB limit in " - "DIB size. This limit does not apply to Windows NT/2000, and " - "this message may be ignored on those platforms.\n", - WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB); - } - /* Release our DC */ ReleaseDC (NULL, hdc); return TRUE; diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index dd2e9b57a..52a4ce26d 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -1010,18 +1010,6 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen) pScreenInfo->dwBPP = dwBPP; } - /* See if the shadow bitmap will be larger than the DIB size limit */ - if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP - >= WIN_DIB_MAXIMUM_SIZE) - { - winErrorFVerb (1, "winAdjustVideoModeShadowDDNL - Requested DirectDraw surface " - "will be larger than %d MB. The surface may fail to be " - "allocated on Windows 95, 98, or Me, due to a %d MB limit in " - "DIB size. This limit does not apply to Windows NT/2000, and " - "this message may be ignored on those platforms.\n", - WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB); - } - /* Release our DC */ ReleaseDC (NULL, hdc); diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index a165d801e..721234eee 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -445,18 +445,6 @@ winAllocateFBShadowGDI (ScreenPtr pScreen) (int) pScreenInfo->dwStride); #endif - /* See if the shadow bitmap will be larger than the DIB size limit */ - if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP - >= WIN_DIB_MAXIMUM_SIZE) - { - ErrorF ("winAllocateFBShadowGDI - Requested DIB (bitmap) " - "will be larger than %d MB. The surface may fail to be " - "allocated on Windows 95, 98, or Me, due to a %d MB limit in " - "DIB size. This limit does not apply to Windows NT/2000, and " - "this message may be ignored on those platforms.\n", - WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB); - } - /* Determine our color masks */ if (!winQueryRGBBitsAndMasks (pScreen)) { |