Add R8_UNORM and R16_UNORM extended surface formats

FNA-XNA · Dec 27, 2024 · cfb8639 · cfb8639
1 parent dcf3678
commit cfb8639
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 1 deletion.
diff --git a/include/FNA3D.h b/include/FNA3D.h
@@ -143,6 +143,8 @@ typedef enum FNA3D_SurfaceFormat
 	FNA3D_SURFACEFORMAT_DXT5SRGB_EXT,
 	FNA3D_SURFACEFORMAT_BC7_EXT,
 	FNA3D_SURFACEFORMAT_BC7SRGB_EXT,
+	FNA3D_SURFACEFORMAT_BYTE_EXT,
+	FNA3D_SURFACEFORMAT_USHORT_EXT,
 } FNA3D_SurfaceFormat;
 
 typedef enum FNA3D_DepthFormat

diff --git a/src/FNA3D_Driver.h b/src/FNA3D_Driver.h
@@ -124,6 +124,8 @@ static inline int32_t Texture_GetBlockSize(
 	case FNA3D_SURFACEFORMAT_VECTOR2:
 	case FNA3D_SURFACEFORMAT_HDRBLENDABLE:
 	case FNA3D_SURFACEFORMAT_VECTOR4:
+	case FNA3D_SURFACEFORMAT_USHORT_EXT:
+	case FNA3D_SURFACEFORMAT_BYTE_EXT:
 		return 1;
 	default:
 		FNA3D_LogError(
@@ -147,12 +149,14 @@ static inline int32_t Texture_GetFormatSize(
 		case FNA3D_SURFACEFORMAT_BC7SRGB_EXT:
 			return 16;
 		case FNA3D_SURFACEFORMAT_ALPHA8:
+		case FNA3D_SURFACEFORMAT_BYTE_EXT:
 			return 1;
 		case FNA3D_SURFACEFORMAT_BGR565:
 		case FNA3D_SURFACEFORMAT_BGRA4444:
 		case FNA3D_SURFACEFORMAT_BGRA5551:
 		case FNA3D_SURFACEFORMAT_HALFSINGLE:
 		case FNA3D_SURFACEFORMAT_NORMALIZEDBYTE2:
+		case FNA3D_SURFACEFORMAT_USHORT_EXT:
 			return 2;
 		case FNA3D_SURFACEFORMAT_COLOR:
 		case FNA3D_SURFACEFORMAT_SINGLE:

diff --git a/src/FNA3D_Driver_D3D11.c b/src/FNA3D_Driver_D3D11.c
@@ -331,6 +331,8 @@ static DXGI_FORMAT XNAToD3D_TextureFormat[] =
 	DXGI_FORMAT_BC3_UNORM_SRGB,	/* SurfaceFormat.Dxt5SrgbEXT */
 	DXGI_FORMAT_BC7_UNORM, /* SurfaceFormat.BC7EXT */
 	DXGI_FORMAT_BC7_UNORM_SRGB,	/* SurfaceFormat.BC7SrgbEXT */
+	DXGI_FORMAT_R8_UNORM,		/* SurfaceFormat.NormalizedByteEXT */
+	DXGI_FORMAT_R16_UNORM,		/* SurfaceFormat.NormalizedUShortEXT */
 };
 
 static DXGI_FORMAT XNAToD3D_DepthFormat[] =

diff --git a/src/FNA3D_Driver_OpenGL.c b/src/FNA3D_Driver_OpenGL.c
@@ -356,6 +356,8 @@ static int32_t XNAToGL_TextureFormat[] =
 	GL_COMPRESSED_TEXTURE_FORMATS,	/* SurfaceFormat.Dxt5SrgbEXT */
 	GL_COMPRESSED_TEXTURE_FORMATS,	/* SurfaceFormat.Bc7EXT */
 	GL_COMPRESSED_TEXTURE_FORMATS,	/* SurfaceFormat.Bc7SrgbEXT */
+	GL_RED,				/* SurfaceFormat.NormalizedByteEXT */
+	GL_RED,				/* SurfaceFormat.NormalizedUShortEXT */
 };
 
 static int32_t XNAToGL_TextureInternalFormat[] =
@@ -385,6 +387,8 @@ static int32_t XNAToGL_TextureInternalFormat[] =
 	GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,	/* SurfaceFormat.Dxt5SrgbEXT */
 	GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,	/* SurfaceFormat.BC7EXT */
 	GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,/* SurfaceFormat.BC7SrgbEXT */
+	GL_R8,				/* SurfaceFormat.NormalizedByteEXT */
+	GL_R16,				/* SurfaceFormat.NormalizedUShortEXT */
 };
 
 static int32_t XNAToGL_TextureDataType[] =
@@ -414,6 +418,8 @@ static int32_t XNAToGL_TextureDataType[] =
 	GL_ZERO,			/* NOPE */
 	GL_ZERO,			/* NOPE */
 	GL_ZERO,			/* NOPE */
+	GL_UNSIGNED_BYTE,		/* SurfaceFormat.NormalizedByteEXT */
+	GL_UNSIGNED_SHORT,		/* SurfaceFormat.NormalizedUShortEXT */
 };
 
 static int32_t XNAToGL_BlendMode[] =

diff --git a/src/FNA3D_Driver_OpenGL.h b/src/FNA3D_Driver_OpenGL.h
@@ -199,6 +199,10 @@ typedef unsigned char	GLboolean;
 #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT		0x8C4F
 #define GL_COMPRESSED_RGBA_BPTC_UNORM_EXT		0x8E8C
 #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT		0x8E8D
+#define GL_R8UI                           0x8232
+#define GL_R16UI                          0x8234
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
 
 /* EXT_framebuffer_sRGB */
 #define GL_FRAMEBUFFER_SRGB_EXT				0x8DB9

diff --git a/src/FNA3D_Driver_SDL.c b/src/FNA3D_Driver_SDL.c
@@ -113,7 +113,9 @@ static SDL_GPUTextureFormat XNAToSDL_SurfaceFormat[] =
 	SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM_SRGB,	/* SurfaceFormat.ColorSrgbEXT */
 	SDL_GPU_TEXTUREFORMAT_BC3_RGBA_UNORM_SRGB,	/* SurfaceFormat.Dxt5SrgbEXT */
 	SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM,		/* SurfaceFormat.Bc7EXT */
-	SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM_SRGB	/* SurfaceFormat.Bc7SrgbEXT */
+	SDL_GPU_TEXTUREFORMAT_BC7_RGBA_UNORM_SRGB,	/* SurfaceFormat.Bc7SrgbEXT */
+	SDL_GPU_TEXTUREFORMAT_R8_UNORM,			/* SurfaceFormat.NormalizedByteEXT */
+	SDL_GPU_TEXTUREFORMAT_R16_UNORM,		/* SurfaceFormat.NormalizedUShortEXT */
 };
 
 static SDL_GPUPrimitiveType XNAToSDL_PrimitiveType[] =