TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 19:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix release build-break

Browse Source
This commit is contained in:
georges 2000-12-19 19:50:43 +00:00
parent a5232c2b04
commit a04bba01d4
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,7 +760,8 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
delete pnmi; delete pnmi;
} }
#if 1 #if 0
//#ifdef _DEBUG
// use dxcapsviewer // use dxcapsviewer
{ static BOOL bPrinted=FALSE; { static BOOL bPrinted=FALSE;
if(!bPrinted) { if(!bPrinted) {
@ -921,7 +922,11 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
if(ddsd.ddpfPixelFormat.dwFlags & DDPF_LUMINANCE) { if(ddsd.ddpfPixelFormat.dwFlags & DDPF_LUMINANCE) {
// look for native lum fmt // look for native lum fmt
if(!dx_force_16bpptextures) { #ifdef _DEBUG
if(!dx_force_16bpptextures)
#endif
{
for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];i<cNumTexPixFmts;i++,pCurPixFmt--) { for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];i<cNumTexPixFmts;i++,pCurPixFmt--) {
if((pCurPixFmt->dwRGBBitCount==16) && (pCurPixFmt->dwFlags & DDPF_ALPHAPIXELS) && if((pCurPixFmt->dwRGBBitCount==16) && (pCurPixFmt->dwFlags & DDPF_ALPHAPIXELS) &&
(pCurPixFmt->dwFlags & DDPF_LUMINANCE)) { (pCurPixFmt->dwFlags & DDPF_LUMINANCE)) {
@ -1021,8 +1026,10 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
// look for native lum fmt // look for native lum fmt
assert(cNumAlphaBits==0); // dont handle those other 8bit lum fmts like 4-4, since 16 8-8 is usually supported too assert(cNumAlphaBits==0); // dont handle those other 8bit lum fmts like 4-4, since 16 8-8 is usually supported too
#ifdef _DEBUG
if(!dx_force_16bpptextures) { if(!dx_force_16bpptextures)
#endif
{
for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];i<cNumTexPixFmts;i++,pCurPixFmt--) { for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];i<cNumTexPixFmts;i++,pCurPixFmt--) {
if((pCurPixFmt->dwRGBBitCount==8) && (pCurPixFmt->dwFlags & DDPF_LUMINANCE) && if((pCurPixFmt->dwRGBBitCount==8) && (pCurPixFmt->dwFlags & DDPF_LUMINANCE) &&
(pCurPixFmt->dwLuminanceBitMask=0xFF)) { (pCurPixFmt->dwLuminanceBitMask=0xFF)) {
@ -1165,8 +1172,9 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
aniso_degree=_tex->get_anisotropic_degree(); aniso_degree=_tex->get_anisotropic_degree();
if((aniso_degree>devDesc.dwMaxAnisotropy) if((aniso_degree>devDesc.dwMaxAnisotropy)
#ifdef _DEBUG #ifdef _DEBUG
|| dx_force_anisotropic_filtering) || dx_force_anisotropic_filtering
#endif #endif
)
aniso_degree=devDesc.dwMaxAnisotropy; aniso_degree=devDesc.dwMaxAnisotropy;
} }
_tex->set_anisotropic_degree(aniso_degree); _tex->set_anisotropic_degree(aniso_degree);