summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-08-10 21:55:15 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2010-09-29 23:23:19 +0100
commit39092011da9be1050dbcb6e59db28e0bbad0c244 (patch)
tree197f28de649d5da399b1e93bfe735b471e253359
parentcb899d6f63bc9d6206e6154aa66e6d8a6cd2478f (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>
-rw-r--r--hw/xwin/win.h3
-rw-r--r--hw/xwin/winshaddd.c13
-rw-r--r--hw/xwin/winshadddnl.c12
-rw-r--r--hw/xwin/winshadgdi.c12
4 files changed, 0 insertions, 40 deletions
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index e5cc5cc2e..d2b1724af 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 034a698f7..e2487a950 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -1004,19 +1004,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 5ebac5e54..ca97327f6 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -1065,18 +1065,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 f66c9e183..c4030864b 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -455,18 +455,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))
{