Home Explore Help
Sign In
cpp
/
bgfx
mirror of https://github.com/bkaradzic/bgfx.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Making RG11B10F name consistent with other texture formats.

Branimir Karadžić 8 years ago
parent
6f224a832b
commit
45e7bf5df4
9 changed files with 11 additions and 11 deletions
Split View Show Diff Stats
  1. 1 1
      include/bgfx/bgfx.h
  2. 1 1
      include/bgfx/c99/bgfx.h
  3. 1 1
      src/bgfx.cpp
  4. 1 1
      src/renderer_d3d11.cpp
  5. 1 1
      src/renderer_d3d12.cpp
  6. 1 1
      src/renderer_d3d9.cpp
  7. 3 3
      src/renderer_gl.cpp
  8. 1 1
      src/renderer_mtl.mm
  9. 1 1
      src/renderer_vk.cpp

+ 1 - 1
include/bgfx/bgfx.h
View File 

@@ -222,7 +222,7 @@ namespace bgfx
 
 			RGBA4,
 
 			RGB5A1,
 
 			RGB10A2,
 
-			R11G11B10F,
 
+			RG11B10F,
 
 
 			UnknownDepth, // Depth formats below.

+ 1 - 1
include/bgfx/c99/bgfx.h
View File 

@@ -172,7 +172,7 @@ typedef enum bgfx_texture_format
 
     BGFX_TEXTURE_FORMAT_RGBA4,
 
     BGFX_TEXTURE_FORMAT_RGB5A1,
 
     BGFX_TEXTURE_FORMAT_RGB10A2,
 
-    BGFX_TEXTURE_FORMAT_R11G11B10F,
 
+    BGFX_TEXTURE_FORMAT_RG11B10F,
 
 
     BGFX_TEXTURE_FORMAT_UNKNOWN_DEPTH,

+ 1 - 1
src/bgfx.cpp
View File 

@@ -3976,7 +3976,7 @@ BGFX_TEXTURE_FORMAT_BIMG(R5G6B5);
 
 BGFX_TEXTURE_FORMAT_BIMG(RGBA4);
 
 BGFX_TEXTURE_FORMAT_BIMG(RGB5A1);
 
 BGFX_TEXTURE_FORMAT_BIMG(RGB10A2);
 
-BGFX_TEXTURE_FORMAT_BIMG(R11G11B10F);
 
+BGFX_TEXTURE_FORMAT_BIMG(RG11B10F);
 
 BGFX_TEXTURE_FORMAT_BIMG(UnknownDepth);
 
 BGFX_TEXTURE_FORMAT_BIMG(D16);
 
 BGFX_TEXTURE_FORMAT_BIMG(D24);

+ 1 - 1
src/renderer_d3d11.cpp
View File 

@@ -287,7 +287,7 @@ namespace bgfx { namespace d3d11
 
 		{ DXGI_FORMAT_B4G4R4A4_UNORM,     DXGI_FORMAT_B4G4R4A4_UNORM,        DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGBA4
 
 		{ DXGI_FORMAT_B5G5R5A1_UNORM,     DXGI_FORMAT_B5G5R5A1_UNORM,        DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGB5A1
 
 		{ DXGI_FORMAT_R10G10B10A2_UNORM,  DXGI_FORMAT_R10G10B10A2_UNORM,     DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGB10A2
 
-		{ DXGI_FORMAT_R11G11B10_FLOAT,    DXGI_FORMAT_R11G11B10_FLOAT,       DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // R11G11B10F
 
+		{ DXGI_FORMAT_R11G11B10_FLOAT,    DXGI_FORMAT_R11G11B10_FLOAT,       DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RG11B10F
 
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // UnknownDepth
 
 		{ DXGI_FORMAT_R16_TYPELESS,       DXGI_FORMAT_R16_UNORM,             DXGI_FORMAT_D16_UNORM,         DXGI_FORMAT_UNKNOWN             }, // D16
 
 		{ DXGI_FORMAT_R24G8_TYPELESS,     DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_UNKNOWN             }, // D24

+ 1 - 1
src/renderer_d3d12.cpp
View File 

@@ -239,7 +239,7 @@ namespace bgfx { namespace d3d12
 
 		{ DXGI_FORMAT_B4G4R4A4_UNORM,     DXGI_FORMAT_B4G4R4A4_UNORM,        DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGBA4
 
 		{ DXGI_FORMAT_B5G5R5A1_UNORM,     DXGI_FORMAT_B5G5R5A1_UNORM,        DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGB5A1
 
 		{ DXGI_FORMAT_R10G10B10A2_UNORM,  DXGI_FORMAT_R10G10B10A2_UNORM,     DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RGB10A2
 
-		{ DXGI_FORMAT_R11G11B10_FLOAT,    DXGI_FORMAT_R11G11B10_FLOAT,       DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // R11G11B10F
 
+		{ DXGI_FORMAT_R11G11B10_FLOAT,    DXGI_FORMAT_R11G11B10_FLOAT,       DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // RG11B10F
 
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN             }, // UnknownDepth
 
 		{ DXGI_FORMAT_R16_TYPELESS,       DXGI_FORMAT_R16_UNORM,             DXGI_FORMAT_D16_UNORM,         DXGI_FORMAT_UNKNOWN             }, // D16
 
 		{ DXGI_FORMAT_R24G8_TYPELESS,     DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_UNKNOWN             }, // D24

+ 1 - 1
src/renderer_d3d9.cpp
View File 

@@ -238,7 +238,7 @@ namespace bgfx { namespace d3d9
 
 		{ D3DFMT_A4R4G4B4      }, // RGBA4
 
 		{ D3DFMT_A1R5G5B5      }, // RGB5A1
 
 		{ D3DFMT_A2B10G10R10   }, // RGB10A2
 
-		{ D3DFMT_UNKNOWN       }, // R11G11B10F
 
+		{ D3DFMT_UNKNOWN       }, // RG11B10F
 
 		{ D3DFMT_UNKNOWN       }, // UnknownDepth
 
 		{ D3DFMT_D16           }, // D16
 
 		{ D3DFMT_D24X8         }, // D24

+ 3 - 3
src/renderer_gl.cpp
View File 

@@ -269,7 +269,7 @@ namespace bgfx { namespace gl
 
 		{ GL_RGBA4,                                    GL_ZERO,                                       GL_RGBA,                                     GL_UNSIGNED_SHORT_4_4_4_4_REV,   false }, // RGBA4
 
 		{ GL_RGB5_A1,                                  GL_ZERO,                                       GL_RGBA,                                     GL_UNSIGNED_SHORT_1_5_5_5_REV,   false }, // RGB5A1
 
 		{ GL_RGB10_A2,                                 GL_ZERO,                                       GL_RGBA,                                     GL_UNSIGNED_INT_2_10_10_10_REV,  false }, // RGB10A2
 
-		{ GL_R11F_G11F_B10F,                           GL_ZERO,                                       GL_RGB,                                      GL_UNSIGNED_INT_10F_11F_11F_REV, false }, // R11G11B10F
 
+		{ GL_R11F_G11F_B10F,                           GL_ZERO,                                       GL_RGB,                                      GL_UNSIGNED_INT_10F_11F_11F_REV, false }, // RG11B10F
 
 		{ GL_ZERO,                                     GL_ZERO,                                       GL_ZERO,                                     GL_ZERO,                         false }, // UnknownDepth
 
 		{ GL_DEPTH_COMPONENT16,                        GL_ZERO,                                       GL_DEPTH_COMPONENT,                          GL_UNSIGNED_SHORT,               false }, // D16
 
 		{ GL_DEPTH_COMPONENT24,                        GL_ZERO,                                       GL_DEPTH_COMPONENT,                          GL_UNSIGNED_INT,                 false }, // D24
 
@@ -352,7 +352,7 @@ namespace bgfx { namespace gl
 
 		GL_RGBA4,              // RGBA4
 
 		GL_RGB5_A1,            // RGB5A1
 
 		GL_RGB10_A2,           // RGB10A2
 
-		GL_R11F_G11F_B10F,     // R11G11B10F
 
+		GL_R11F_G11F_B10F,     // RG11B10F
 
 		GL_ZERO,               // UnknownDepth
 
 		GL_DEPTH_COMPONENT16,  // D16
 
 		GL_DEPTH_COMPONENT24,  // D24
 
@@ -433,7 +433,7 @@ namespace bgfx { namespace gl
 
 		GL_RGBA4,          // RGBA4
 
 		GL_RGB5_A1,        // RGB5A1
 
 		GL_RGB10_A2,       // RGB10A2
 
-		GL_R11F_G11F_B10F, // R11G11B10F
 
+		GL_R11F_G11F_B10F, // RG11B10F
 
 		GL_ZERO,           // UnknownDepth
 
 		GL_ZERO,           // D16
 
 		GL_ZERO,           // D24

+ 1 - 1
src/renderer_mtl.mm
View File 

@@ -327,7 +327,7 @@ namespace bgfx { namespace mtl
 
 		{ MTLPixelFormat(42) /*ABGR4Unorm*/,			MTLPixelFormatInvalid                        }, // RGBA4
 
 		{ MTLPixelFormat(41) /*A1BGR5Unorm*/,			MTLPixelFormatInvalid                        }, // RGB5A1
 
 		{ MTLPixelFormatRGB10A2Unorm,					MTLPixelFormatInvalid                        }, // RGB10A2
 
-		{ MTLPixelFormatRG11B10Float,					MTLPixelFormatInvalid                        }, // R11G11B10F
 
+		{ MTLPixelFormatRG11B10Float,					MTLPixelFormatInvalid                        }, // RG11B10F
 
 		{ MTLPixelFormatInvalid,						MTLPixelFormatInvalid                        }, // UnknownDepth
 
 		{ MTLPixelFormatDepth32Float,					MTLPixelFormatInvalid                        }, // D16
 
 		{ MTLPixelFormatDepth32Float,					MTLPixelFormatInvalid                        }, // D24

+ 1 - 1
src/renderer_vk.cpp
View File 

@@ -209,7 +209,7 @@ VK_IMPORT_DEVICE
 
 		{ VK_FORMAT_B4G4R4A4_UNORM_PACK16,     VK_FORMAT_B4G4R4A4_UNORM_PACK16,    VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // RGBA4
 
 		{ VK_FORMAT_B5G5R5A1_UNORM_PACK16,     VK_FORMAT_B5G5R5A1_UNORM_PACK16,    VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // RGB5A1
 
 		{ VK_FORMAT_A2R10G10B10_UNORM_PACK32,  VK_FORMAT_A2R10G10B10_UNORM_PACK32, VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // RGB10A2
 
-		{ VK_FORMAT_B10G11R11_UFLOAT_PACK32,   VK_FORMAT_B10G11R11_UFLOAT_PACK32,  VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // R11G11B10F
 
+		{ VK_FORMAT_B10G11R11_UFLOAT_PACK32,   VK_FORMAT_B10G11R11_UFLOAT_PACK32,  VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // RG11B10F
 
 		{ VK_FORMAT_UNDEFINED,                 VK_FORMAT_UNDEFINED,                VK_FORMAT_UNDEFINED,           VK_FORMAT_UNDEFINED                }, // UnknownDepth
 
 		{ VK_FORMAT_UNDEFINED,                 VK_FORMAT_R16_UNORM,                VK_FORMAT_D16_UNORM,           VK_FORMAT_UNDEFINED                }, // D16
 
 		{ VK_FORMAT_UNDEFINED,                 VK_FORMAT_X8_D24_UNORM_PACK32,      VK_FORMAT_D24_UNORM_S8_UINT,   VK_FORMAT_UNDEFINED                }, // D24