Moving the Format specific enum from internal to external file (#53)
diff --git a/Source/GmmLib/inc/External/Common/GmmPlatformExt.h b/Source/GmmLib/inc/External/Common/GmmPlatformExt.h index 49cbbc6..19ff12c 100644 --- a/Source/GmmLib/inc/External/Common/GmmPlatformExt.h +++ b/Source/GmmLib/inc/External/Common/GmmPlatformExt.h
@@ -21,6 +21,82 @@ ============================================================================*/ #pragma once +typedef enum GMM_FLATCCS_FORMAT_ENUM +{ + GMM_FLATCCS_FORMAT_R16S = 0, + GMM_FLATCCS_FORMAT_R16U = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RG16F = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RG16U = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RG16S = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RGBA16S = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RGBA16U = GMM_FLATCCS_FORMAT_R16S, + GMM_FLATCCS_FORMAT_RGBA16F = GMM_FLATCCS_FORMAT_R16S, + + GMM_FLATCCS_MIN_RC_FORMAT = GMM_FLATCCS_FORMAT_R16S, + + GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_R32S = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_R32U = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RG32F = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RG32S = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RG32U = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RGBA32F = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RGBA32S = GMM_FLATCCS_FORMAT_R32F, + GMM_FLATCCS_FORMAT_RGBA32U = GMM_FLATCCS_FORMAT_R32F, + + GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_RGBA4 = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_B5G6R5 = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_R8S = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_R8U = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_RG8S = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_RG8U = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_RGBA8S = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_RGBA8U = GMM_FLATCCS_FORMAT_RGB5A1, + GMM_FLATCCS_FORMAT_ML8 = GMM_FLATCCS_FORMAT_RGB5A1, + + GMM_FLATCCS_FORMAT_RGB10A2, + GMM_FLATCCS_FORMAT_RG11B10, + + GMM_FLATCCS_FORMAT_R32F1, + GMM_FLATCCS_FORMAT_R32S1 = GMM_FLATCCS_FORMAT_R32F1, + GMM_FLATCCS_FORMAT_R32U1 = GMM_FLATCCS_FORMAT_R32F1, + + GMM_FLATCCS_FORMAT_R16F1, + GMM_FLATCCS_FORMAT_R16S1 = GMM_FLATCCS_FORMAT_R16F1, + GMM_FLATCCS_FORMAT_R16U1 = GMM_FLATCCS_FORMAT_R16F1, + + GMM_FLATCCS_FORMAT_R8S1, + GMM_FLATCCS_FORMAT_R8U1 = GMM_FLATCCS_FORMAT_R8S1, + + GMM_FLATCCS_MAX_RC_FORMAT = GMM_FLATCCS_FORMAT_R8U1, + + GMM_FLATCCS_MIN_MC_FORMAT = 0x21, //(0x1 <<5) ie Msb-5th bit turned on to identify MC encoding, to drop before SurfaceState usage + GMM_FLATCCS_FORMAT_RGBA16_MEDIA = GMM_FLATCCS_MIN_MC_FORMAT, + GMM_FLATCCS_FORMAT_Y210, + GMM_FLATCCS_FORMAT_YUY2, + GMM_FLATCCS_FORMAT_Y410, + GMM_FLATCCS_FORMAT_Y216, + GMM_FLATCCS_FORMAT_Y416, + GMM_FLATCCS_FORMAT_P010, + GMM_FLATCCS_FORMAT_P016, + GMM_FLATCCS_FORMAT_AYUV, + GMM_FLATCCS_FORMAT_ARGB8b, + GMM_FLATCCS_FORMAT_SWAPY, + GMM_FLATCCS_FORMAT_SWAPUV, + GMM_FLATCCS_FORMAT_SWAPUVY, + GMM_FLATCCS_FORMAT_RGB10b, + GMM_FLATCCS_FORMAT_NV12, + + GMM_FLATCCS_FORMAT_YCRCB_SWAPUV = GMM_FLATCCS_FORMAT_SWAPUV, + GMM_FLATCCS_FORMAT_YCRCB_SWAPUVY = GMM_FLATCCS_FORMAT_SWAPUVY, + GMM_FLATCCS_FORMAT_YCRCB_SWAPY = GMM_FLATCCS_FORMAT_SWAPY, + + GMM_FLATCCS_MAX_MC_FORMAT = GMM_FLATCCS_FORMAT_NV12, //should always be equal to last format encoding + + GMM_FLATCCS_FORMAT_INVALID, //equal to last valid encoding plus one +} GMM_FLATCCS_FORMAT; + #ifdef __cplusplus extern "C" { #endif /*__cplusplus*/
diff --git a/Source/GmmLib/inc/Internal/Common/Platform/GmmGen12Platform.h b/Source/GmmLib/inc/Internal/Common/Platform/GmmGen12Platform.h index 4cac7ba..eba7545 100644 --- a/Source/GmmLib/inc/Internal/Common/Platform/GmmGen12Platform.h +++ b/Source/GmmLib/inc/Internal/Common/Platform/GmmGen12Platform.h
@@ -77,82 +77,6 @@ CCS_UNIT CCSEx[CCS_MODES]; }GMM_TEXTURE_ALIGN_EX; -typedef enum GMM_FLATCCS_FORMAT_ENUM -{ - GMM_FLATCCS_FORMAT_R16S = 0, - GMM_FLATCCS_FORMAT_R16U = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RG16F = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RG16U = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RG16S = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RGBA16S = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RGBA16U = GMM_FLATCCS_FORMAT_R16S, - GMM_FLATCCS_FORMAT_RGBA16F = GMM_FLATCCS_FORMAT_R16S, - - GMM_FLATCCS_MIN_RC_FORMAT = GMM_FLATCCS_FORMAT_R16S, - - GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_R32S = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_R32U = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RG32F = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RG32S = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RG32U = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RGBA32F = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RGBA32S = GMM_FLATCCS_FORMAT_R32F, - GMM_FLATCCS_FORMAT_RGBA32U = GMM_FLATCCS_FORMAT_R32F, - - GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_RGBA4 = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_B5G6R5 = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_R8S = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_R8U = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_RG8S = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_RG8U = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_RGBA8S = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_RGBA8U = GMM_FLATCCS_FORMAT_RGB5A1, - GMM_FLATCCS_FORMAT_ML8 = GMM_FLATCCS_FORMAT_RGB5A1, - - GMM_FLATCCS_FORMAT_RGB10A2, - GMM_FLATCCS_FORMAT_RG11B10, - - GMM_FLATCCS_FORMAT_R32F1, - GMM_FLATCCS_FORMAT_R32S1 = GMM_FLATCCS_FORMAT_R32F1, - GMM_FLATCCS_FORMAT_R32U1 = GMM_FLATCCS_FORMAT_R32F1, - - GMM_FLATCCS_FORMAT_R16F1, - GMM_FLATCCS_FORMAT_R16S1 = GMM_FLATCCS_FORMAT_R16F1, - GMM_FLATCCS_FORMAT_R16U1 = GMM_FLATCCS_FORMAT_R16F1, - - GMM_FLATCCS_FORMAT_R8S1, - GMM_FLATCCS_FORMAT_R8U1 = GMM_FLATCCS_FORMAT_R8S1, - - GMM_FLATCCS_MAX_RC_FORMAT = GMM_FLATCCS_FORMAT_R8U1, - - GMM_FLATCCS_MIN_MC_FORMAT = 0x21, //(0x1 <<5) ie Msb-5th bit turned on to identify MC encoding, to drop before SurfaceState usage - GMM_FLATCCS_FORMAT_RGBA16_MEDIA = GMM_FLATCCS_MIN_MC_FORMAT, - GMM_FLATCCS_FORMAT_Y210, - GMM_FLATCCS_FORMAT_YUY2, - GMM_FLATCCS_FORMAT_Y410, - GMM_FLATCCS_FORMAT_Y216, - GMM_FLATCCS_FORMAT_Y416, - GMM_FLATCCS_FORMAT_P010, - GMM_FLATCCS_FORMAT_P016, - GMM_FLATCCS_FORMAT_AYUV, - GMM_FLATCCS_FORMAT_ARGB8b, - GMM_FLATCCS_FORMAT_SWAPY, - GMM_FLATCCS_FORMAT_SWAPUV, - GMM_FLATCCS_FORMAT_SWAPUVY, - GMM_FLATCCS_FORMAT_RGB10b, - GMM_FLATCCS_FORMAT_NV12, - - GMM_FLATCCS_FORMAT_YCRCB_SWAPUV = GMM_FLATCCS_FORMAT_SWAPUV, - GMM_FLATCCS_FORMAT_YCRCB_SWAPUVY = GMM_FLATCCS_FORMAT_SWAPUVY, - GMM_FLATCCS_FORMAT_YCRCB_SWAPY = GMM_FLATCCS_FORMAT_SWAPY, - - GMM_FLATCCS_MAX_MC_FORMAT = GMM_FLATCCS_FORMAT_NV12, //should always be equal to last format encoding - - GMM_FLATCCS_FORMAT_INVALID, //equal to last valid encoding plus one -} GMM_FLATCCS_FORMAT; - #ifdef __cplusplus namespace GmmLib