From a04bba01d4ca7a576fdab94e2ea28da84e57152c Mon Sep 17 00:00:00 2001 From: georges <> Date: Tue, 19 Dec 2000 19:50:43 +0000 Subject: [PATCH] fix release build-break --- panda/src/dxgsg/dxTextureContext.cxx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/panda/src/dxgsg/dxTextureContext.cxx b/panda/src/dxgsg/dxTextureContext.cxx index f37fdc4151..b7b66079be 100644 --- a/panda/src/dxgsg/dxTextureContext.cxx +++ b/panda/src/dxgsg/dxTextureContext.cxx @@ -760,7 +760,8 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, delete pnmi; } -#if 1 +#if 0 +//#ifdef _DEBUG // use dxcapsviewer { static BOOL bPrinted=FALSE; if(!bPrinted) { @@ -921,7 +922,11 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, if(ddsd.ddpfPixelFormat.dwFlags & DDPF_LUMINANCE) { // look for native lum fmt - if(!dx_force_16bpptextures) { + #ifdef _DEBUG + if(!dx_force_16bpptextures) + #endif + { + for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];idwRGBBitCount==16) && (pCurPixFmt->dwFlags & DDPF_ALPHAPIXELS) && (pCurPixFmt->dwFlags & DDPF_LUMINANCE)) { @@ -1021,8 +1026,10 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, // 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 - - if(!dx_force_16bpptextures) { + #ifdef _DEBUG + if(!dx_force_16bpptextures) + #endif + { for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];idwRGBBitCount==8) && (pCurPixFmt->dwFlags & DDPF_LUMINANCE) && (pCurPixFmt->dwLuminanceBitMask=0xFF)) { @@ -1165,8 +1172,9 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, aniso_degree=_tex->get_anisotropic_degree(); if((aniso_degree>devDesc.dwMaxAnisotropy) #ifdef _DEBUG - || dx_force_anisotropic_filtering) + || dx_force_anisotropic_filtering #endif + ) aniso_degree=devDesc.dwMaxAnisotropy; } _tex->set_anisotropic_degree(aniso_degree);