Skip to content

A
angle
Commit 932b465b by Geoff Lang
Options

Add format size information for DXGI_FORMATs.

Change-Id: I14d0b8ebd631e5c9c3c3b63c047c9ef7c11bf310 Reviewed-on: https://chromium-review.googlesource.com/236304Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent eca8561e
Showing with 112 additions and 11 deletions
src/libANGLE/renderer/d3d/d3d11/formatutils11.cpp
...@@ -127,6 +127,90 @@ static D3D11FastCopyMap BuildFastCopyMap() ...@@ -127,6 +127,90 @@ static D3D11FastCopyMap BuildFastCopyMap()
return map; return map;
} }
struct DXGIColorFormatInfo
{
size_t redBits;
size_t greenBits;
size_t blueBits;
size_t luminanceBits;
size_t alphaBits;
size_t sharedBits;
};
typedef std::map<DXGI_FORMAT, DXGIColorFormatInfo> ColorFormatInfoMap;
typedef std::pair<DXGI_FORMAT, DXGIColorFormatInfo> ColorFormatInfoPair;
static inline void InsertDXGIColorFormatInfo(ColorFormatInfoMap *map, DXGI_FORMAT format, size_t redBits, size_t greenBits,
size_t blueBits, size_t alphaBits, size_t sharedBits)
{
DXGIColorFormatInfo info;
info.redBits = redBits;
info.greenBits = greenBits;
info.blueBits = blueBits;
info.alphaBits = alphaBits;
info.sharedBits = sharedBits;
map->insert(std::make_pair(format, info));
}
static ColorFormatInfoMap BuildColorFormatInfoMap()
{
ColorFormatInfoMap map;
// | DXGI format | R | G | B | A | S |
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_A8_UNORM, 0, 0, 0, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8_UNORM, 8, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8_UNORM, 8, 8, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8B8A8_UNORM, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_B8G8R8A8_UNORM, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8_SNORM, 8, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8_SNORM, 8, 8, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8B8A8_SNORM, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8_UINT, 8, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16_UINT, 16, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32_UINT, 32, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8_UINT, 8, 8, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16_UINT, 16, 16, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32_UINT, 32, 32, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32_UINT, 32, 32, 32, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8B8A8_UINT, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16B16A16_UINT, 16, 16, 16, 16, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32A32_UINT, 32, 32, 32, 32, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8_SINT, 8, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16_SINT, 16, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32_SINT, 32, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8_SINT, 8, 8, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16_SINT, 16, 16, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32_SINT, 32, 32, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32_SINT, 32, 32, 32, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R8G8B8A8_SINT, 8, 8, 8, 8, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16B16A16_SINT, 16, 16, 16, 16, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32A32_SINT, 32, 32, 32, 32, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R10G10B10A2_UNORM, 10, 10, 10, 2, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R10G10B10A2_UINT, 10, 10, 10, 2, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16_FLOAT, 16, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16_FLOAT, 16, 16, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R16G16B16A16_FLOAT, 16, 16, 16, 16, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32_FLOAT, 32, 0, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32_FLOAT, 32, 32, 0, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32_FLOAT, 32, 32, 32, 0, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R32G32B32A32_FLOAT, 32, 32, 32, 32, 0);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 9, 9, 9, 0, 5);
InsertDXGIColorFormatInfo(&map, DXGI_FORMAT_R11G11B10_FLOAT, 11, 11, 10, 0, 0);
return map;
}
struct DXGIDepthStencilInfo struct DXGIDepthStencilInfo
{ {
unsigned int depthBits; unsigned int depthBits;
...@@ -179,6 +263,11 @@ DXGIFormat::DXGIFormat() ...@@ -179,6 +263,11 @@ DXGIFormat::DXGIFormat()
: pixelBytes(0), : pixelBytes(0),
blockWidth(0), blockWidth(0),
blockHeight(0), blockHeight(0),
redBits(0),
greenBits(0),
blueBits(0),
alphaBits(0),
sharedBits(0),
depthBits(0), depthBits(0),
depthOffset(0), depthOffset(0),
stencilBits(0), stencilBits(0),
...@@ -205,21 +294,27 @@ void AddDXGIFormat(DXGIFormatInfoMap *map, DXGI_FORMAT dxgiFormat, GLuint pixelB ...@@ -205,21 +294,27 @@ void AddDXGIFormat(DXGIFormatInfoMap *map, DXGI_FORMAT dxgiFormat, GLuint pixelB
info.blockWidth = blockWidth; info.blockWidth = blockWidth;
info.blockHeight = blockHeight; info.blockHeight = blockHeight;
static const ColorFormatInfoMap colorInfoMap = BuildColorFormatInfoMap();
ColorFormatInfoMap::const_iterator colorInfoIter = colorInfoMap.find(dxgiFormat);
if (colorInfoIter != colorInfoMap.end())
{
const DXGIColorFormatInfo &colorInfo = colorInfoIter->second;
info.redBits = colorInfo.redBits;
info.greenBits = colorInfo.greenBits;
info.blueBits = colorInfo.blueBits;
info.alphaBits = colorInfo.alphaBits;
info.sharedBits = colorInfo.sharedBits;
}
static const DepthStencilInfoMap dsInfoMap = BuildDepthStencilInfoMap(); static const DepthStencilInfoMap dsInfoMap = BuildDepthStencilInfoMap();
DepthStencilInfoMap::const_iterator dsInfoIter = dsInfoMap.find(dxgiFormat); DepthStencilInfoMap::const_iterator dsInfoIter = dsInfoMap.find(dxgiFormat);
if (dsInfoIter != dsInfoMap.end()) if (dsInfoIter != dsInfoMap.end())
{ {
info.depthBits = dsInfoIter->second.depthBits; const DXGIDepthStencilInfo &dsInfo = dsInfoIter->second;
info.depthOffset = dsInfoIter->second.depthOffset; info.depthBits = dsInfo.depthBits;
info.stencilBits = dsInfoIter->second.stencilBits; info.depthOffset = dsInfo.depthOffset;
info.stencilOffset = dsInfoIter->second.stencilOffset; info.stencilBits = dsInfo.stencilBits;
} info.stencilOffset = dsInfo.stencilOffset;
else
{
info.depthBits = 0;
info.depthOffset = 0;
info.stencilBits = 0;
info.stencilOffset = 0;
} }
static const DXGIToESFormatMap dxgiToESMap = BuildDXGIToESFormatMap(); static const DXGIToESFormatMap dxgiToESMap = BuildDXGIToESFormatMap();
......
src/libANGLE/renderer/d3d/d3d11/formatutils11.h
...@@ -30,6 +30,12 @@ struct DXGIFormat ...@@ -30,6 +30,12 @@ struct DXGIFormat
GLuint blockWidth; GLuint blockWidth;
GLuint blockHeight; GLuint blockHeight;
GLuint redBits;
GLuint greenBits;
GLuint blueBits;
GLuint alphaBits;
GLuint sharedBits;
GLuint depthBits; GLuint depthBits;
GLuint depthOffset; GLuint depthOffset;
GLuint stencilBits; GLuint stencilBits;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment