New enums for new texture formats Added new enums for: - 8/16/32 bit integers - R, RG, RGB, RGBA - Normalized and unnormalized Also fixed FORMAT_LAST. Change-Id: Ie3eb5286820c44490630e302907350358a1d85dc Reviewed-on: https://swiftshader-review.googlesource.com/4110 Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/Renderer/Surface.hpp b/src/Renderer/Surface.hpp index fe0817e..47a023f 100644 --- a/src/Renderer/Surface.hpp +++ b/src/Renderer/Surface.hpp
@@ -47,7 +47,14 @@ FORMAT_NULL, FORMAT_A8, - FORMAT_R8, + FORMAT_R8I, + FORMAT_R8UI, + FORMAT_R8I_SNORM, + FORMAT_R8, // UI_SNORM + FORMAT_R16I, + FORMAT_R16UI, + FORMAT_R32I, + FORMAT_R32UI, FORMAT_R3G3B2, FORMAT_A8R3G3B2, FORMAT_X4R4G4B4, @@ -58,16 +65,37 @@ FORMAT_B8G8R8, FORMAT_X8R8G8B8, FORMAT_A8R8G8B8, - FORMAT_X8B8G8R8, - FORMAT_A8B8G8R8, + FORMAT_X8B8G8R8I, + FORMAT_X8B8G8R8UI, + FORMAT_X8B8G8R8I_SNORM, + FORMAT_X8B8G8R8, // UI_SNORM + FORMAT_A8B8G8R8I, + FORMAT_A8B8G8R8UI, + FORMAT_A8B8G8R8I_SNORM, + FORMAT_A8B8G8R8, // UI_SNORM FORMAT_X1R5G5B5, FORMAT_A1R5G5B5, FORMAT_R5G5B5A1, - FORMAT_G8R8, - FORMAT_G16R16, + FORMAT_G8R8I, + FORMAT_G8R8UI, + FORMAT_G8R8I_SNORM, + FORMAT_G8R8, // UI_SNORM + FORMAT_G16R16, // D3D format + FORMAT_G16R16I, + FORMAT_G16R16UI, + FORMAT_G32R32I, + FORMAT_G32R32UI, FORMAT_A2R10G10B10, FORMAT_A2B10G10R10, - FORMAT_A16B16G16R16, + FORMAT_A16B16G16R16, // D3D format + FORMAT_X16B16G16R16I, + FORMAT_X16B16G16R16UI, + FORMAT_A16B16G16R16I, + FORMAT_A16B16G16R16UI, + FORMAT_X32B32G32R32I, + FORMAT_X32B32G32R32UI, + FORMAT_A32B32G32R32I, + FORMAT_A32B32G32R32UI, // Paletted formats FORMAT_P8, FORMAT_A8P8, @@ -168,7 +196,7 @@ FORMAT_YV12_BT709, FORMAT_YV12_JFIF, // Full-swing BT.601 - FORMAT_LAST = FORMAT_A8G8R8B8Q + FORMAT_LAST = FORMAT_YV12_JFIF }; enum Lock