From b17ccf57493793445b3339e1f7986ef6aa559a4b Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 24 Jan 2001 19:21:55 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/dxgsg/dxGraphicsStateGuardian.h | 2 +- panda/src/dxgsg/dxTextureContext.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.h b/panda/src/dxgsg/dxGraphicsStateGuardian.h index 79fd538ee1..bf15b6e10b 100644 --- a/panda/src/dxgsg/dxGraphicsStateGuardian.h +++ b/panda/src/dxgsg/dxGraphicsStateGuardian.h @@ -377,7 +377,7 @@ public: LPDIRECT3D7 d3d, LPDIRECT3DDEVICE7 d3dDevice, RECT viewrect); - friend HRESULT CALLBACK DXGraphicsStateGuardian::EnumTexFmtsCallback( LPDDPIXELFORMAT pddpf, VOID* param ); + friend HRESULT CALLBACK EnumTexFmtsCallback( LPDDPIXELFORMAT pddpf, VOID* param ); private: static TypeHandle _type_handle; diff --git a/panda/src/dxgsg/dxTextureContext.cxx b/panda/src/dxgsg/dxTextureContext.cxx index b7b66079be..df41e76297 100644 --- a/panda/src/dxgsg/dxTextureContext.cxx +++ b/panda/src/dxgsg/dxTextureContext.cxx @@ -1032,7 +1032,7 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, { for(i=0,pCurPixFmt=&pTexPixFmts[cNumTexPixFmts-1];idwRGBBitCount==8) && (pCurPixFmt->dwFlags & DDPF_LUMINANCE) && - (pCurPixFmt->dwLuminanceBitMask=0xFF)) { + (pCurPixFmt->dwLuminanceBitMask==0xFF)) { ConvNeeded=ConvLum8to8; goto found_matching_format; } @@ -1105,7 +1105,7 @@ CreateTexture( HDC PrimaryDC, LPDIRECT3DDEVICE7 pd3dDevice, int cNumTexPixFmts, ft =_tex->get_magfilter(); 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; else ft=Texture::FT_linear; }