Skip to content

Commit d7d935c

Browse files
johnmachjohnmach
authored
Moving the Format specific enum from internal to external file (#53)
1 parent 11ce561 commit d7d935c

File tree

2 files changed

+76
-76
lines changed

2 files changed

+76
-76
lines changed

‎Source/GmmLib/inc/External/Common/GmmPlatformExt.h‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,82 @@ OTHER DEALINGS IN THE SOFTWARE.
2121
============================================================================*/
2222
#pragma once
2323

24+
typedef enum GMM_FLATCCS_FORMAT_ENUM
25+
{
26+
GMM_FLATCCS_FORMAT_R16S = 0,
27+
GMM_FLATCCS_FORMAT_R16U = GMM_FLATCCS_FORMAT_R16S,
28+
GMM_FLATCCS_FORMAT_RG16F = GMM_FLATCCS_FORMAT_R16S,
29+
GMM_FLATCCS_FORMAT_RG16U = GMM_FLATCCS_FORMAT_R16S,
30+
GMM_FLATCCS_FORMAT_RG16S = GMM_FLATCCS_FORMAT_R16S,
31+
GMM_FLATCCS_FORMAT_RGBA16S = GMM_FLATCCS_FORMAT_R16S,
32+
GMM_FLATCCS_FORMAT_RGBA16U = GMM_FLATCCS_FORMAT_R16S,
33+
GMM_FLATCCS_FORMAT_RGBA16F = GMM_FLATCCS_FORMAT_R16S,
34+
35+
GMM_FLATCCS_MIN_RC_FORMAT = GMM_FLATCCS_FORMAT_R16S,
36+
37+
GMM_FLATCCS_FORMAT_R32F,
38+
GMM_FLATCCS_FORMAT_R32S = GMM_FLATCCS_FORMAT_R32F,
39+
GMM_FLATCCS_FORMAT_R32U = GMM_FLATCCS_FORMAT_R32F,
40+
GMM_FLATCCS_FORMAT_RG32F = GMM_FLATCCS_FORMAT_R32F,
41+
GMM_FLATCCS_FORMAT_RG32S = GMM_FLATCCS_FORMAT_R32F,
42+
GMM_FLATCCS_FORMAT_RG32U = GMM_FLATCCS_FORMAT_R32F,
43+
GMM_FLATCCS_FORMAT_RGBA32F = GMM_FLATCCS_FORMAT_R32F,
44+
GMM_FLATCCS_FORMAT_RGBA32S = GMM_FLATCCS_FORMAT_R32F,
45+
GMM_FLATCCS_FORMAT_RGBA32U = GMM_FLATCCS_FORMAT_R32F,
46+
47+
GMM_FLATCCS_FORMAT_RGB5A1,
48+
GMM_FLATCCS_FORMAT_RGBA4 = GMM_FLATCCS_FORMAT_RGB5A1,
49+
GMM_FLATCCS_FORMAT_B5G6R5 = GMM_FLATCCS_FORMAT_RGB5A1,
50+
GMM_FLATCCS_FORMAT_R8S = GMM_FLATCCS_FORMAT_RGB5A1,
51+
GMM_FLATCCS_FORMAT_R8U = GMM_FLATCCS_FORMAT_RGB5A1,
52+
GMM_FLATCCS_FORMAT_RG8S = GMM_FLATCCS_FORMAT_RGB5A1,
53+
GMM_FLATCCS_FORMAT_RG8U = GMM_FLATCCS_FORMAT_RGB5A1,
54+
GMM_FLATCCS_FORMAT_RGBA8S = GMM_FLATCCS_FORMAT_RGB5A1,
55+
GMM_FLATCCS_FORMAT_RGBA8U = GMM_FLATCCS_FORMAT_RGB5A1,
56+
GMM_FLATCCS_FORMAT_ML8 = GMM_FLATCCS_FORMAT_RGB5A1,
57+
58+
GMM_FLATCCS_FORMAT_RGB10A2,
59+
GMM_FLATCCS_FORMAT_RG11B10,
60+
61+
GMM_FLATCCS_FORMAT_R32F1,
62+
GMM_FLATCCS_FORMAT_R32S1 = GMM_FLATCCS_FORMAT_R32F1,
63+
GMM_FLATCCS_FORMAT_R32U1 = GMM_FLATCCS_FORMAT_R32F1,
64+
65+
GMM_FLATCCS_FORMAT_R16F1,
66+
GMM_FLATCCS_FORMAT_R16S1 = GMM_FLATCCS_FORMAT_R16F1,
67+
GMM_FLATCCS_FORMAT_R16U1 = GMM_FLATCCS_FORMAT_R16F1,
68+
69+
GMM_FLATCCS_FORMAT_R8S1,
70+
GMM_FLATCCS_FORMAT_R8U1 = GMM_FLATCCS_FORMAT_R8S1,
71+
72+
GMM_FLATCCS_MAX_RC_FORMAT = GMM_FLATCCS_FORMAT_R8U1,
73+
74+
GMM_FLATCCS_MIN_MC_FORMAT = 0x21, //(0x1 <<5) ie Msb-5th bit turned on to identify MC encoding, to drop before SurfaceState usage
75+
GMM_FLATCCS_FORMAT_RGBA16_MEDIA = GMM_FLATCCS_MIN_MC_FORMAT,
76+
GMM_FLATCCS_FORMAT_Y210,
77+
GMM_FLATCCS_FORMAT_YUY2,
78+
GMM_FLATCCS_FORMAT_Y410,
79+
GMM_FLATCCS_FORMAT_Y216,
80+
GMM_FLATCCS_FORMAT_Y416,
81+
GMM_FLATCCS_FORMAT_P010,
82+
GMM_FLATCCS_FORMAT_P016,
83+
GMM_FLATCCS_FORMAT_AYUV,
84+
GMM_FLATCCS_FORMAT_ARGB8b,
85+
GMM_FLATCCS_FORMAT_SWAPY,
86+
GMM_FLATCCS_FORMAT_SWAPUV,
87+
GMM_FLATCCS_FORMAT_SWAPUVY,
88+
GMM_FLATCCS_FORMAT_RGB10b,
89+
GMM_FLATCCS_FORMAT_NV12,
90+
91+
GMM_FLATCCS_FORMAT_YCRCB_SWAPUV = GMM_FLATCCS_FORMAT_SWAPUV,
92+
GMM_FLATCCS_FORMAT_YCRCB_SWAPUVY = GMM_FLATCCS_FORMAT_SWAPUVY,
93+
GMM_FLATCCS_FORMAT_YCRCB_SWAPY = GMM_FLATCCS_FORMAT_SWAPY,
94+
95+
GMM_FLATCCS_MAX_MC_FORMAT = GMM_FLATCCS_FORMAT_NV12, //should always be equal to last format encoding
96+
97+
GMM_FLATCCS_FORMAT_INVALID, //equal to last valid encoding plus one
98+
} GMM_FLATCCS_FORMAT;
99+
24100
#ifdef __cplusplus
25101
extern "C" {
26102
#endif /*__cplusplus*/

‎Source/GmmLib/inc/Internal/Common/Platform/GmmGen12Platform.h‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -77,82 +77,6 @@ typedef struct GMM_TEXTURE_ALIGN_EX_REC
7777
CCS_UNIT CCSEx[CCS_MODES];
7878
}GMM_TEXTURE_ALIGN_EX;
7979

80-
typedef enum GMM_FLATCCS_FORMAT_ENUM
81-
{
82-
GMM_FLATCCS_FORMAT_R16S = 0,
83-
GMM_FLATCCS_FORMAT_R16U = GMM_FLATCCS_FORMAT_R16S,
84-
GMM_FLATCCS_FORMAT_RG16F = GMM_FLATCCS_FORMAT_R16S,
85-
GMM_FLATCCS_FORMAT_RG16U = GMM_FLATCCS_FORMAT_R16S,
86-
GMM_FLATCCS_FORMAT_RG16S = GMM_FLATCCS_FORMAT_R16S,
87-
GMM_FLATCCS_FORMAT_RGBA16S = GMM_FLATCCS_FORMAT_R16S,
88-
GMM_FLATCCS_FORMAT_RGBA16U = GMM_FLATCCS_FORMAT_R16S,
89-
GMM_FLATCCS_FORMAT_RGBA16F = GMM_FLATCCS_FORMAT_R16S,
90-
91-
GMM_FLATCCS_MIN_RC_FORMAT = GMM_FLATCCS_FORMAT_R16S,
92-
93-
GMM_FLATCCS_FORMAT_R32F,
94-
GMM_FLATCCS_FORMAT_R32S = GMM_FLATCCS_FORMAT_R32F,
95-
GMM_FLATCCS_FORMAT_R32U = GMM_FLATCCS_FORMAT_R32F,
96-
GMM_FLATCCS_FORMAT_RG32F = GMM_FLATCCS_FORMAT_R32F,
97-
GMM_FLATCCS_FORMAT_RG32S = GMM_FLATCCS_FORMAT_R32F,
98-
GMM_FLATCCS_FORMAT_RG32U = GMM_FLATCCS_FORMAT_R32F,
99-
GMM_FLATCCS_FORMAT_RGBA32F = GMM_FLATCCS_FORMAT_R32F,
100-
GMM_FLATCCS_FORMAT_RGBA32S = GMM_FLATCCS_FORMAT_R32F,
101-
GMM_FLATCCS_FORMAT_RGBA32U = GMM_FLATCCS_FORMAT_R32F,
102-
103-
GMM_FLATCCS_FORMAT_RGB5A1,
104-
GMM_FLATCCS_FORMAT_RGBA4 = GMM_FLATCCS_FORMAT_RGB5A1,
105-
GMM_FLATCCS_FORMAT_B5G6R5 = GMM_FLATCCS_FORMAT_RGB5A1,
106-
GMM_FLATCCS_FORMAT_R8S = GMM_FLATCCS_FORMAT_RGB5A1,
107-
GMM_FLATCCS_FORMAT_R8U = GMM_FLATCCS_FORMAT_RGB5A1,
108-
GMM_FLATCCS_FORMAT_RG8S = GMM_FLATCCS_FORMAT_RGB5A1,
109-
GMM_FLATCCS_FORMAT_RG8U = GMM_FLATCCS_FORMAT_RGB5A1,
110-
GMM_FLATCCS_FORMAT_RGBA8S = GMM_FLATCCS_FORMAT_RGB5A1,
111-
GMM_FLATCCS_FORMAT_RGBA8U = GMM_FLATCCS_FORMAT_RGB5A1,
112-
GMM_FLATCCS_FORMAT_ML8 = GMM_FLATCCS_FORMAT_RGB5A1,
113-
114-
GMM_FLATCCS_FORMAT_RGB10A2,
115-
GMM_FLATCCS_FORMAT_RG11B10,
116-
117-
GMM_FLATCCS_FORMAT_R32F1,
118-
GMM_FLATCCS_FORMAT_R32S1 = GMM_FLATCCS_FORMAT_R32F1,
119-
GMM_FLATCCS_FORMAT_R32U1 = GMM_FLATCCS_FORMAT_R32F1,
120-
121-
GMM_FLATCCS_FORMAT_R16F1,
122-
GMM_FLATCCS_FORMAT_R16S1 = GMM_FLATCCS_FORMAT_R16F1,
123-
GMM_FLATCCS_FORMAT_R16U1 = GMM_FLATCCS_FORMAT_R16F1,
124-
125-
GMM_FLATCCS_FORMAT_R8S1,
126-
GMM_FLATCCS_FORMAT_R8U1 = GMM_FLATCCS_FORMAT_R8S1,
127-
128-
GMM_FLATCCS_MAX_RC_FORMAT = GMM_FLATCCS_FORMAT_R8U1,
129-
130-
GMM_FLATCCS_MIN_MC_FORMAT = 0x21, //(0x1 <<5) ie Msb-5th bit turned on to identify MC encoding, to drop before SurfaceState usage
131-
GMM_FLATCCS_FORMAT_RGBA16_MEDIA = GMM_FLATCCS_MIN_MC_FORMAT,
132-
GMM_FLATCCS_FORMAT_Y210,
133-
GMM_FLATCCS_FORMAT_YUY2,
134-
GMM_FLATCCS_FORMAT_Y410,
135-
GMM_FLATCCS_FORMAT_Y216,
136-
GMM_FLATCCS_FORMAT_Y416,
137-
GMM_FLATCCS_FORMAT_P010,
138-
GMM_FLATCCS_FORMAT_P016,
139-
GMM_FLATCCS_FORMAT_AYUV,
140-
GMM_FLATCCS_FORMAT_ARGB8b,
141-
GMM_FLATCCS_FORMAT_SWAPY,
142-
GMM_FLATCCS_FORMAT_SWAPUV,
143-
GMM_FLATCCS_FORMAT_SWAPUVY,
144-
GMM_FLATCCS_FORMAT_RGB10b,
145-
GMM_FLATCCS_FORMAT_NV12,
146-
147-
GMM_FLATCCS_FORMAT_YCRCB_SWAPUV = GMM_FLATCCS_FORMAT_SWAPUV,
148-
GMM_FLATCCS_FORMAT_YCRCB_SWAPUVY = GMM_FLATCCS_FORMAT_SWAPUVY,
149-
GMM_FLATCCS_FORMAT_YCRCB_SWAPY = GMM_FLATCCS_FORMAT_SWAPY,
150-
151-
GMM_FLATCCS_MAX_MC_FORMAT = GMM_FLATCCS_FORMAT_NV12, //should always be equal to last format encoding
152-
153-
GMM_FLATCCS_FORMAT_INVALID, //equal to last valid encoding plus one
154-
} GMM_FLATCCS_FORMAT;
155-
15680
#ifdef __cplusplus
15781

15882
namespace GmmLib

0 commit comments

Comments
 (0)