diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx index a71166172c..1c702ff623 100644 --- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx +++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx @@ -1997,8 +1997,6 @@ void DXGraphicsStateGuardian:: draw_prim_inner_loop(int nVerts, const Geom *geom, ushort perFlags) { Vertexf NextVert; - assert((_CurShadeMode==D3DSHADE_GOURAUD)==(geom->get_binding(G_COLOR)==G_PER_VERTEX)); - for(;nVerts > 0;nVerts--) { // coord info will always be _perVertex GET_NEXT_VERTEX(NextVert); // need to optimize these diff --git a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx index 4995f081ca..0dc4561c14 100644 --- a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx +++ b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx @@ -1728,8 +1728,10 @@ bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) { _dxgsg->scrn.MaxAvailVidMem = dwVidMemTotal; #define LOWVIDMEMTHRESHOLD 3500000 - // assume buggy drivers (this means you, FireGL2) may return zero for dwVidMemFree, so ignore value if its 0 - _dxgsg->scrn.bIsLowVidMemCard = ((dwVidMemFree>0) && (dwVidMemFree< LOWVIDMEMTHRESHOLD)); + #define CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD 1000000 // every vidcard we deal with should have at least 1MB + + // assume buggy drivers (this means you, FireGL2) may return zero for dwVidMemTotal, so ignore value if its < CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD + _dxgsg->scrn.bIsLowVidMemCard = ((dwVidMemTotal>CRAPPY_DRIVER_IS_LYING_VIDMEMTHRESHOLD) && (dwVidMemTotal< LOWVIDMEMTHRESHOLD)); if(DeviceIdx==SWRASTIDX) { // this will force 640x480x16, is this what we want for all sw rast?