TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

add swrast flags

Browse Source
This commit is contained in:
cxgeorge 2002-02-24 04:11:39 +00:00
parent bfcc892a8c
commit a1195a43fc
6 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/dxgsg/config_dxgsg.cxx
View File

@ -60,6 +60,9 @@ bool dx_no_vertex_fog = config_dxgsg.GetBool("dx-no-vertex-fog", false);
// variable
bool dx_auto_normalize_lighting = config_dxgsg.GetBool("auto-normalize-lighting", false);
bool dx_allow_software_renderer = config_dxgsg.GetBool("dx-allow-software-renderer", false);
bool dx_force_software_renderer = config_dxgsg.GetBool("dx-force-software-renderer", false);
bool dx_show_fps_meter = config_dxgsg.GetBool("show-fps-meter", false);
float dx_fps_meter_update_interval = max(0.5,config_dxgsg.GetFloat("fps-meter-update-interval", 1.7));

2
panda/src/dxgsg/config_dxgsg.h
View File

@ -33,6 +33,8 @@ extern bool dx_full_screen_antialiasing;
extern float dx_fps_meter_update_interval;
extern bool dx_auto_normalize_lighting;
extern bool dx_use_rangebased_fog;
extern bool dx_allow_software_renderer;
extern bool dx_force_software_renderer;
extern const bool link_tristrips;
// debug flags we might want to use in full optimized build

7
panda/src/dxgsg/dxGraphicsStateGuardian.cxx
View File

@ -864,7 +864,12 @@ dx_init( void) {
DX_DECLARE_CLEAN(DDSURFACEDESC2, ddsd);
ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT ;
ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
ddsd.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_HINTSTATIC;
if(!scrn.bIsSWRast)
ddsd.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_HINTSTATIC;
else {
ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
}
ddsd.dwTextureStage=0;
ddsd.dwFlags |= DDSD_TEXTURESTAGE;

1
panda/src/dxgsg/dxGraphicsStateGuardian.h
View File

@ -56,6 +56,7 @@ typedef struct {
DWORD MaxAvailVidMem;
bool bIsLowVidMemCard;
bool bIsTNLDevice;
bool bIsSWRast;
ushort depth_buffer_bitdepth; //GetSurfaceDesc is not reliable so must store this explicitly
ushort CardIDNum; // its posn in DisplayArray, for dbgprint purposes
DDDEVICEIDENTIFIER2 DXDeviceID;

8
panda/src/dxgsg/dxTextureContext.cxx
View File

@ -1503,8 +1503,12 @@ LPDIRECTDRAWSURFACE7 DXTextureContext::CreateTexture(LPDIRECT3DDEVICE7 pd3dDevic
ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
ddsd.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE // Turn on texture management
| DDSCAPS2_HINTSTATIC; // BUGBUG: is this ok for ALL textures?
if(pD3DDevDesc->dwDevCaps & D3DDEVCAPS_HWRASTERIZATION) {
ddsd.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE // Turn on texture management
| DDSCAPS2_HINTSTATIC; // BUGBUG: is this ok for ALL textures?
} else {
ddsd.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
}
// validate magfilter setting
// degrade filtering if no HW support

52
panda/src/wdxdisplay/wdxGraphicsWindow.cxx
View File

@ -1302,15 +1302,17 @@ HRESULT CALLBACK EnumDevicesCallback(LPSTR pDeviceDescription, LPSTR pDeviceName
wdxdisplay_cat.spam() << "Enumerating Device " << pDeviceName << " : " << pDeviceDescription << endl;
#endif
#define REGHALIDX 0
#define TNLHALIDX 1
// only saves hal and tnl devs, not sw rasts
#define SWRASTIDX 2
if(IsEqualGUID(pD3DDeviceDesc->deviceGUID,IID_IDirect3DHALDevice)) {
CopyMemory(&pd3ddevs[REGHALIDX],pD3DDeviceDesc,sizeof(D3DDEVICEDESC7));
} else if(IsEqualGUID(pD3DDeviceDesc->deviceGUID,IID_IDirect3DTnLHalDevice)) {
CopyMemory(&pd3ddevs[TNLHALIDX],pD3DDeviceDesc,sizeof(D3DDEVICEDESC7));
} else if(IsEqualGUID(pD3DDeviceDesc->deviceGUID,IID_IDirect3DRGBDevice)) {
CopyMemory(&pd3ddevs[SWRASTIDX],pD3DDeviceDesc,sizeof(D3DDEVICEDESC7));
}
return DDENUMRET_OK;
}
@ -1626,7 +1628,7 @@ check_for_color_cursor_support(void) {
bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) {
DWORD dwRenderWidth = _props._xsize;
DWORD dwRenderHeight = _props._ysize;
LPDIRECTDRAW7 pDD;
LPDIRECTDRAW7 pDD=NULL;
HRESULT hr;
assert(_dxgsg!=NULL);
@ -1639,8 +1641,8 @@ bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) {
assert(_pParentWindowGroup->_pDDCreateEx!=NULL);
// Create the Direct Draw Objects
hr = (*_pParentWindowGroup->_pDDCreateEx)(pDDDeviceGUID,(void **)&pDD, IID_IDirectDraw7, NULL);
if(hr != DD_OK) {
hr = (*(_pParentWindowGroup->_pDDCreateEx))(pDDDeviceGUID,(void **)&pDD, IID_IDirectDraw7, NULL);
if((hr != DD_OK)||(pDD==NULL)) {
wdxdisplay_cat.fatal() << "DirectDrawCreateEx failed for monitor("<<devnum<< "): result = " << ConvD3DErrorToString(hr) << endl;
return false;
}
@ -1670,12 +1672,12 @@ bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) {
goto error_exit;
}
D3DDEVICEDESC7 d3ddevs[2]; // put HAL in 0, TnLHAL in 1
D3DDEVICEDESC7 d3ddevs[3]; // put HAL in 0, TnLHAL in 1, SW rast in 2
// just look for HAL and TnL devices right now. I dont think
// we have any interest in the sw rasts at this point
ZeroMemory(d3ddevs,2*sizeof(D3DDEVICEDESC7));
ZeroMemory(d3ddevs,3*sizeof(D3DDEVICEDESC7));
hr = _dxgsg->scrn.pD3D->EnumDevices(EnumDevicesCallback,d3ddevs);
if(hr != DD_OK) {
@ -1684,17 +1686,21 @@ bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) {
}
WORD DeviceIdx;
DeviceIdx=REGHALIDX;
if(!(d3ddevs[REGHALIDX].dwDevCaps & D3DDEVCAPS_HWRASTERIZATION )) {
// should never get here because enum devices should filter out non-HAL devices
wdxdisplay_cat.error() << "No 3D HW present on device #"<<devnum<<", skipping it... (" << _dxgsg->scrn.DXDeviceID.szDescription<<")\n";
goto error_exit;
}
// select TNL if present
if(d3ddevs[TNLHALIDX].dwDevCaps & D3DDEVCAPS_HWRASTERIZATION) {
DeviceIdx=TNLHALIDX;
} else if(d3ddevs[REGHALIDX].dwDevCaps & D3DDEVCAPS_HWRASTERIZATION) {
DeviceIdx=REGHALIDX;
} else if(dx_allow_software_renderer || dx_force_software_renderer) {
DeviceIdx=SWRASTIDX;
} else {
wdxdisplay_cat.error() << "No 3D HW present on device #"<<devnum<<", skipping it... (" << _dxgsg->scrn.DXDeviceID.szDescription<<")\n";
goto error_exit;
}
if(dx_force_software_renderer) {
DeviceIdx=SWRASTIDX;
}
memcpy(&_dxgsg->scrn.D3DDevDesc,&d3ddevs[DeviceIdx],sizeof(D3DDEVICEDESC7));
@ -1725,6 +1731,13 @@ bool wdxGraphicsWindow::search_for_device(int devnum,DXDeviceInfo *pDevinfo) {
// 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));
if(DeviceIdx==SWRASTIDX) {
// this will force 640x480x16, is this what we want for all sw rast?
_dxgsg->scrn.bIsLowVidMemCard = true;
_dxgsg->scrn.bIsSWRast = true;
dx_force_16bpp_zbuffer = true;
}
if(dx_full_screen) {
_props._xorg = _props._yorg = 0;
@ -1933,7 +1946,6 @@ CreateScreenBuffersAndDevice(DXScreenData &Display) {
assert(pDD!=NULL);
assert(pD3DI!=NULL);
assert(pD3DDevDesc->dwDevCaps & D3DDEVCAPS_HWRASTERIZATION );
/*
// select the best device if the caller does not provide one
@ -2169,7 +2181,7 @@ CreateScreenBuffersAndDevice(DXScreenData &Display) {
// Setup the surface desc for the z-buffer.
ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT;
ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | DDSCAPS_VIDEOMEMORY;
ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER | ((_dxgsg->scrn.bIsSWRast) ? DDSCAPS_SYSTEMMEMORY : DDSCAPS_VIDEOMEMORY);
DDPIXELFORMAT ZBufPixFmts[MAX_DX_ZBUF_FMTS];
cNumZBufFmts=0;
@ -2225,6 +2237,9 @@ CreateScreenBuffersAndDevice(DXScreenData &Display) {
#define SET_ZBUF_DEPTH(DEPTH) { assert(pz##DEPTH != NULL); Display.depth_buffer_bitdepth=DEPTH; ddsd.ddpfPixelFormat = *pz##DEPTH;}
if(_dxgsg->scrn.bIsSWRast) {
SET_ZBUF_DEPTH(16); // need this for fast path rasterizers
} else
if(IS_NVIDIA(Display.DXDeviceID)) {
DX_DECLARE_CLEAN(DDSURFACEDESC2,ddsd_pri)
pPrimaryDDSurf->GetSurfaceDesc(&ddsd_pri);
@ -2898,13 +2913,18 @@ void wdxGraphicsWindowGroup::initWindowGroup(void) {
}
}
assert(_windows[0] != NULL);
for(i=0;i<num_windows;i++) {
_windows[i]->config_window(this);
}
assert(_windows[0] != NULL);
DWORD good_device_count=0;
if(num_windows==1) {
assert(_windows[0] != NULL);
if(_windows[0]->search_for_device(0,NULL))
good_device_count=1;
} else {