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

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-01-24 19:21:55 +00:00
parent 4a9abedc55
commit b17ccf5749
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,7 +377,7 @@ public:
LPDIRECT3D7 d3d, LPDIRECT3D7 d3d,
LPDIRECT3DDEVICE7 d3dDevice, LPDIRECT3DDEVICE7 d3dDevice,
RECT viewrect); RECT viewrect);
friend HRESULT CALLBACK DXGraphicsStateGuardian::EnumTexFmtsCallback( LPDDPIXELFORMAT pddpf, VOID* param ); friend HRESULT CALLBACK EnumTexFmtsCallback( LPDDPIXELFORMAT pddpf, VOID* param );
private: private:
static TypeHandle _type_handle; static TypeHandle _type_handle;

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

@ -1032,7 +1032,7 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
{ {
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)) {
ConvNeeded=ConvLum8to8; ConvNeeded=ConvLum8to8;
goto found_matching_format; goto found_matching_format;
} }
@ -1105,7 +1105,7 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts,
ft =_tex->get_magfilter(); ft =_tex->get_magfilter();
if((ft!=Texture::FT_linear) && ft!=Texture::FT_nearest) { if((ft!=Texture::FT_linear) && ft!=Texture::FT_nearest) {
if(ft=Texture::FT_nearest_mipmap_nearest) if(ft==Texture::FT_nearest_mipmap_nearest)
ft=Texture::FT_nearest; ft=Texture::FT_nearest;
else ft=Texture::FT_linear; else ft=Texture::FT_linear;
} }