Skip to content
Browse files

Merge pull request #2415 from ace20022/undertaker

Bury dead code
  • Loading branch information...
2 parents f24b21f + f13f2c3 commit 1a695c36256c3c948a8e12126d7dd74c950a069e Arne Morten Kvarving committed Mar 16, 2013
Showing with 0 additions and 10 deletions.
  1. +0 −5 xbmc/guilib/GUIFontTTFDX.cpp
  2. +0 −5 xbmc/guilib/GUITextureD3D.cpp
View
5 xbmc/guilib/GUIFontTTFDX.cpp
@@ -71,13 +71,8 @@ void CGUIFontTTFDX::Begin()
{
pD3DDevice->SetTextureStageState( unit, D3DTSS_COLOROP , D3DTOP_ADD );
pD3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG1, D3DTA_CURRENT) ;
-#if(1)
pD3DDevice->SetRenderState( D3DRS_TEXTUREFACTOR, D3DCOLOR_RGBA(16,16,16,0) );
pD3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG2, D3DTA_TFACTOR );
-#else
- pD3DDevice->SetTextureStageState( unit, D3DTSS_CONSTANT , D3DCOLOR_RGBA(16,16,16,0) );
- pD3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG2, D3DTA_CONSTANT );
-#endif
unit++;
}
View
5 xbmc/guilib/GUITextureD3D.cpp
@@ -68,13 +68,8 @@ void CGUITextureD3D::Begin(color_t color)
, GET_A(color));
p3DDevice->SetTextureStageState( unit, D3DTSS_COLOROP , D3DTOP_ADD );
p3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG1, D3DTA_CURRENT) ;
-#if(1)
p3DDevice->SetRenderState( D3DRS_TEXTUREFACTOR, D3DCOLOR_RGBA(16,16,16, 0) );
p3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG2, D3DTA_TFACTOR );
-#else
- p3DDevice->SetTextureStageState( unit, D3DTSS_CONSTANT , D3DCOLOR_RGBA(16,16,16, 0) );
- p3DDevice->SetTextureStageState( unit, D3DTSS_COLORARG2, D3DTA_CONSTANT );
-#endif
unit++;
}
else

0 comments on commit 1a695c3

Please sign in to comment.
Something went wrong with that request. Please try again.