浏览代码

let all intel cards work at 800x600,1024x768

cxgeorge 23 年之前
父节点
当前提交
57e33677f2
共有 2 个文件被更改,包括 12 次插入5 次删除
  1. 7 4
      panda/src/wdxdisplay/wdxGraphicsWindow.cxx
  2. 5 1
      panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx

+ 7 - 4
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
 // overrides of the general estimator for known working cases
 bool wdxGraphicsWindow::
 bool wdxGraphicsWindow::
 special_check_fullscreen_resolution(UINT xsize,UINT ysize) {
 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 VendorId=_dxgsg->scrn.DXDeviceID.dwVendorId;
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.dwDeviceId;
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.dwDeviceId;
     switch(VendorId) {
     switch(VendorId) {
         case 0x8086:  // Intel
         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)||
             if((DeviceId==0x7121)||(DeviceId==0x7123)||(DeviceId==0x7125)||
-               (DeviceId==0x1132)) {
-
+               (DeviceId==0x1132)) 
+             */
+            {
                 if((xsize==800)&&(ysize==600))
                 if((xsize==800)&&(ysize==600))
                     return true;
                     return true;
                 if((xsize==1024)&&(ysize==768))
                 if((xsize==1024)&&(ysize==768))

+ 5 - 1
panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx

@@ -1637,9 +1637,13 @@ special_check_fullscreen_resolution(UINT xsize,UINT ysize) {
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.DeviceId;
     DWORD DeviceId=_dxgsg->scrn.DXDeviceID.DeviceId;
     switch(VendorId) {
     switch(VendorId) {
         case 0x8086:  // Intel
         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
             // Intel i810,i815,82810
             if((DeviceId==0x7121)||(DeviceId==0x7123)||(DeviceId==0x7125)||
             if((DeviceId==0x7121)||(DeviceId==0x7123)||(DeviceId==0x7125)||
-               (DeviceId==0x1132)) {
+               (DeviceId==0x1132)) 
+             */
+            {
                 if((xsize==800)&&(ysize==600))
                 if((xsize==800)&&(ysize==600))
                     return true;
                     return true;
                 if((xsize==1024)&&(ysize==768))
                 if((xsize==1024)&&(ysize==768))