From 57e33677f2f4e9c779fce014313e1fc2e9d46256 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Tue, 8 Oct 2002 18:28:18 +0000
Subject: [PATCH] let all intel cards work at 800x600,1024x768

---
 panda/src/wdxdisplay/wdxGraphicsWindow.cxx   | 11 +++++++----
 panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
index 9f8e37936d..094fbb08bc 100644
--- a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
+++ b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx
@@ -1543,16 +1543,19 @@ bool wdxGraphicsWindow::resize(unsigned int xsize,unsigned int ysize) {
 // overrides of the general estimator for known working cases
 bool wdxGraphicsWindow::
 special_check_fullscreen_resolution(UINT xsize,UINT ysize) {
-    //assert(IS_VALID_PTR(_dxgsg));
+    // assert(IS_VALID_PTR(_dxgsg));
 
     DWORD VendorId=_dxgsg->scrn.DXDeviceID.dwVendorId;
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.dwDeviceId;
     switch(VendorId) {
         case 0x8086:  // Intel
-            // Intel i810,i815
+            /*for now, just validate all the intel cards at these resolutions.
+              I dont have a complete list of deviceIDs (missing 82830, 845, etc)
+            // Intel i810,i815,82810
             if((DeviceId==0x7121)||(DeviceId==0x7123)||(DeviceId==0x7125)||
-               (DeviceId==0x1132)) {
-
+               (DeviceId==0x1132)) 
+             */
+            {
                 if((xsize==800)&&(ysize==600))
                     return true;
                 if((xsize==1024)&&(ysize==768))
diff --git a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
index 81b19eecee..cd408f189f 100644
--- a/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
+++ b/panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
@@ -1637,9 +1637,13 @@ special_check_fullscreen_resolution(UINT xsize,UINT ysize) {
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.DeviceId;
     switch(VendorId) {
         case 0x8086:  // Intel
+            /*for now, just validate all the intel cards at these resolutions.
+              I dont have a complete list of deviceIDs (missing 82830, 845, etc)
             // Intel i810,i815,82810
             if((DeviceId==0x7121)||(DeviceId==0x7123)||(DeviceId==0x7125)||
-               (DeviceId==0x1132)) {
+               (DeviceId==0x1132)) 
+             */
+            {
                 if((xsize==800)&&(ysize==600))
                     return true;
                 if((xsize==1024)&&(ysize==768))