mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-04 10:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4737 from lioncash/bpmem

Browse Source 
BPMemory: Minor changes
This commit is contained in:
Matthew Parlane 2017-01-24 11:00:25 +13:00 committed by GitHub
commit 98c4ceb3d1
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/VideoCommon/BPMemory.cpp
View File

@ -4,6 +4,30 @@
#include "VideoCommon/BPMemory.h" #include "VideoCommon/BPMemory.h"
#include <cstring>
// BP state // BP state
// STATE_TO_SAVE // STATE_TO_SAVE
BPMemory bpmem; BPMemory bpmem;
float FogParam0::GetA() const
{
// scale mantissa from 11 to 23 bits
const u32 integral = (static_cast<u32>(sign) << 31) | (static_cast<u32>(exponent) << 23) |
(static_cast<u32>(mantissa) << 12);
float real;
std::memcpy(&real, &integral, sizeof(u32));
return real;
}
float FogParam3::GetC() const
{
// scale mantissa from 11 to 23 bits
const u32 integral = (static_cast<u32>(c_sign) << 31) | (static_cast<u32>(c_exp) << 23) |
(static_cast<u32>(c_mant) << 12);
float real;
std::memcpy(&real, &integral, sizeof(u32));
return real;
}

38
Source/Core/VideoCommon/BPMemory.h
View File

@ -376,7 +376,7 @@ union TevStageIndirect
// If bs and mid are zero, the result of the stage is independent of // If bs and mid are zero, the result of the stage is independent of
// the texture sample data, so we can skip sampling the texture. // the texture sample data, so we can skip sampling the texture.
bool IsActive() { return bs != ITBA_OFF || mid != 0; } bool IsActive() const { return bs != ITBA_OFF || mid != 0; }
}; };
union TwoTevStageOrders union TwoTevStageOrders
@ -435,8 +435,8 @@ union RAS1_IREF
}; };
u32 hex; u32 hex;
u32 getTexCoord(int i) { return (hex >> (6 * i + 3)) & 7; } u32 getTexCoord(int i) const { return (hex >> (6 * i + 3)) & 7; }
u32 getTexMap(int i) { return (hex >> (6 * i)) & 7; } u32 getTexMap(int i) const { return (hex >> (6 * i)) & 7; }
}; };
// Texture structs // Texture structs
@ -674,17 +674,7 @@ union FogParam0
u32 sign : 1; u32 sign : 1;
}; };
float GetA() float GetA() const;
{
union
{
u32 i;
float f;
} dummy;
dummy.i = ((u32)sign << 31) | ((u32)exponent << 23) |
((u32)mantissa << 12); // scale mantissa from 11 to 23 bits
return dummy.f;
}
u32 hex; u32 hex;
}; };
@ -701,17 +691,7 @@ union FogParam3
}; };
// amount to subtract from eyespacez after range adjustment // amount to subtract from eyespacez after range adjustment
float GetC() float GetC() const;
{
union
{
u32 i;
float f;
} dummy;
dummy.i = ((u32)c_sign << 31) | ((u32)c_exp << 23) |
((u32)c_mant << 12); // scale mantissa from 11 to 23 bits
return dummy.f;
}
u32 hex; u32 hex;
}; };
@ -726,7 +706,7 @@ union FogRangeKElement
}; };
// TODO: Which scaling coefficient should we use here? This is just a guess! // TODO: Which scaling coefficient should we use here? This is just a guess!
float GetValue(int i) { return (i ? HI : LO) / 256.f; } float GetValue(int i) const { return (i ? HI : LO) / 256.f; }
u32 HEX; u32 HEX;
}; };
@ -912,8 +892,8 @@ union TevKSel
}; };
u32 hex; u32 hex;
int getKC(int i) { return i ? kcsel1 : kcsel0; } int getKC(int i) const { return i ? kcsel1 : kcsel0; }
int getKA(int i) { return i ? kasel1 : kasel0; } int getKA(int i) const { return i ? kasel1 : kasel0; }
}; };
union AlphaTest union AlphaTest
@ -1013,7 +993,7 @@ union UPE_Copy
BitField<16, 1, u32> BitField<16, 1, u32>
auto_conv; // if 0 automatic color conversion by texture format and pixel type auto_conv; // if 0 automatic color conversion by texture format and pixel type
u32 tp_realFormat() { return target_pixel_format / 2 + (target_pixel_format & 1) * 8; } u32 tp_realFormat() const { return target_pixel_format / 2 + (target_pixel_format & 1) * 8; }
}; };
union BPU_PreloadTileInfo union BPU_PreloadTileInfo