ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4268 from lioncash/cast 

VertexManagerBase: Get rid of a u16 cast
This commit is contained in:
Mat M 2016-10-01 08:21:24 -04:00 committed by GitHub
parent 8017e11784 361c7c9c09
commit 4eeb158b58
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoCommon/VertexManagerBase.h
View File

@ -33,18 +33,19 @@ struct Slope
class VertexManagerBase class VertexManagerBase
{ {
private: private:
static const u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float) * 3; // 3 pos // 3 pos
static const u32 LARGEST_POSSIBLE_VERTEX = static constexpr u32 SMALLEST_POSSIBLE_VERTEX = sizeof(float) * 3;
sizeof(float) * 45 + sizeof(u32) * 2; // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat // 3 pos, 3*3 normal, 2*u32 color, 8*4 tex, 1 posMat
static constexpr u32 LARGEST_POSSIBLE_VERTEX = sizeof(float) * 45 + sizeof(u32) * 2;
static const u32 MAX_PRIMITIVES_PER_COMMAND = (u16)-1; static constexpr u32 MAX_PRIMITIVES_PER_COMMAND = 65535;
public: public:
static const u32 MAXVBUFFERSIZE = static constexpr u32 MAXVBUFFERSIZE =
ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * LARGEST_POSSIBLE_VERTEX); ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * LARGEST_POSSIBLE_VERTEX);
// We may convert triangle-fans to triangle-lists, almost 3x as many indices. // We may convert triangle-fans to triangle-lists, almost 3x as many indices.
static const u32 MAXIBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * 3); static constexpr u32 MAXIBUFFERSIZE = ROUND_UP_POW2(MAX_PRIMITIVES_PER_COMMAND * 3);
VertexManagerBase(); VertexManagerBase();
// needs to be virtual for DX11's dtor // needs to be virtual for DX11's dtor