Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13130 from samcake/blue

Browse source 
Fix size calculation of compressed textures #13120
This commit is contained in:
John Conklin II 2018-05-09 11:45:10 -07:00 committed by GitHub
commit b9656e5c72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
libraries/gpu/src/gpu/Format.h
View file

@ -50,47 +50,50 @@ enum Type : uint8_t {
};
// Array providing the size in bytes for a given scalar type
static const int TYPE_SIZE[NUM_TYPES] = {
4,
4,
4,
2,
2,
2,
1,
1,
4, // FLOAT
4, // INT32
4, // UINT32
2, // HALF
2, // INT16
2, // UINT16
1, // INT8
1, // UINT8
// normalized values
4,
4,
2,
2,
1,
1,
4,
4, // NINT32
4, // NUINT32
2, // NINT16
2, // NUINT16
1, // NINT8
1, // NUINT8
1, // NUINT2
1, // NINT2_10_10_10
1
1, // COMPRESSED
};
// Array answering the question Does this type is integer or not
static const bool TYPE_IS_INTEGER[NUM_TYPES] = {
false,
true,
true,
false,
true,
true,
true,
true,
false, // FLOAT
true, // INT32
true, // UINT32
false, // HALF
true, // INT16
true, // UINT16
true, // INT8
true, // UINT8
// Normalized values
false,
false,
false,
false,
false,
false,
false,
false, // NINT32
false, // NUINT32
false, // NINT16
false, // NUINT16
false, // NINT8
false, // NUINT8
false, // NUINT2
false, // NINT2_10_10_10
false,
false, // COMPRESSED
};
// Dimension of an Element
@ -367,9 +370,9 @@ public:
static const Element PART_DRAWCALL;
protected:
uint8 _semantic;
uint8 _dimension : 4;
uint8 _type : 4;
uint16 _semantic : 7;
uint16 _dimension : 4;
uint16 _type : 5;
};