Skip to content

Commit 9cef3b0

Browse files
committed
tweak(textureloader): Remove superfluous texture reduction code from TextureLoadTaskClass::Begin_Uncompressed_Load() (#2789)
1 parent f8686d6 commit 9cef3b0

1 file changed

Lines changed: 6 additions & 27 deletions

File tree

Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,18 +1568,7 @@ bool TextureLoadTaskClass::Begin_Uncompressed_Load()
15681568

15691569
Width = orig_width;
15701570
Height = orig_height;
1571-
Reduction = orig_reduction;
1572-
1573-
if (!Texture->Is_Reducible() || Texture->MipLevelCount == MIP_LEVELS_1)
1574-
Reduction = 0; //app doesn't want this texture to ever be reduced.
1575-
else
1576-
//Make sure we don't reduce below the level requested by the app
1577-
if (Texture->MipLevelCount != MIP_LEVELS_ALL && (Texture->MipLevelCount - Reduction) < 1)
1578-
Reduction = Texture->MipLevelCount - 1;
1579-
1580-
//Another sanity check
1581-
if (Reduction >= orig_mip_count)
1582-
Reduction = 0; //should not be possible to get here, but check just in case.
1571+
Reduction = 0;
15831572

15841573
if (Format == WW3D_FORMAT_UNKNOWN)
15851574
{
@@ -1590,24 +1579,12 @@ bool TextureLoadTaskClass::Begin_Uncompressed_Load()
15901579
Format = Get_Valid_Texture_Format(Format, false);
15911580
}
15921581

1593-
int reducedWidth=Width;
1594-
int reducedHeight=Height;
1595-
int reducedMipCount=Texture->MipLevelCount;
1596-
1597-
if (Reduction)
1598-
{ //we don't care about specific levels so reduce them if needed.
1599-
reducedWidth >>= Reduction;
1600-
reducedHeight >>= Reduction;
1601-
if (reducedMipCount != MIP_LEVELS_ALL)
1602-
reducedMipCount -= Reduction;
1603-
}
1604-
16051582
D3DTexture = DX8Wrapper::_Create_DX8_Texture
16061583
(
1607-
reducedWidth,
1608-
reducedHeight,
1584+
Width,
1585+
Height,
16091586
Format,
1610-
(MipCountType)reducedMipCount,
1587+
Texture->MipLevelCount,
16111588
#ifdef USE_MANAGED_TEXTURES
16121589
D3DPOOL_MANAGED
16131590
#else
@@ -2199,6 +2176,7 @@ bool CubeTextureLoadTaskClass::Begin_Uncompressed_Load()
21992176

22002177
Width = orig_width;
22012178
Height = orig_height;
2179+
Reduction = 0;
22022180

22032181
if (Format == WW3D_FORMAT_UNKNOWN)
22042182
{
@@ -2567,6 +2545,7 @@ bool VolumeTextureLoadTaskClass::Begin_Uncompressed_Load()
25672545
Width = orig_width;
25682546
Height = orig_height;
25692547
Depth = orig_depth;
2548+
Reduction = 0;
25702549

25712550
if (Format == WW3D_FORMAT_UNKNOWN)
25722551
{

0 commit comments

Comments
 (0)