Skip to content

A
angle
Commit e9e8a899 by Jamie Madill Committed by Commit Bot
Options

D3D11: Fix some format support entries.

On Intel these were seeingly missing or erroneous. BUG=angleproject:1389 BUG=angleproject:1459 Change-Id: I4410407ce1171f420b275c7662896f5b26a949c2 Reviewed-on: https://chromium-review.googlesource.com/395168Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 08e229e7
Showing with 16 additions and 16 deletions
src/libANGLE/renderer/d3d/d3d11/dxgi_support_data.json
...@@ -543,8 +543,8 @@ ...@@ -543,8 +543,8 @@
"texture2D": "10_0", "texture2D": "10_0",
"texture3D": "10_0", "texture3D": "10_0",
"textureCube": "10_0", "textureCube": "10_0",
"shaderSample": "10_0", "shaderSample": "9_3check_10_0always",
"renderTarget": "10_0", "renderTarget": "9_3check_10_0always",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "10_0" "mipAutoGen": "10_0"
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
"texture3D": "always", "texture3D": "always",
"textureCube": "always", "textureCube": "always",
"shaderSample": "always", "shaderSample": "always",
"renderTarget": "10_0", "renderTarget": "9_3check_10_0always",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "10_0" "mipAutoGen": "10_0"
...@@ -943,7 +943,7 @@ ...@@ -943,7 +943,7 @@
"renderTarget": "dxgi1_2", "renderTarget": "dxgi1_2",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "always" "mipAutoGen": "dxgi1_2"
}, },
"DXGI_FORMAT_B5G5R5A1_UNORM": "DXGI_FORMAT_B5G5R5A1_UNORM":
{ {
...@@ -954,7 +954,7 @@ ...@@ -954,7 +954,7 @@
"renderTarget": "check", "renderTarget": "check",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "never" "mipAutoGen": "dxgi1_2"
}, },
"DXGI_FORMAT_B8G8R8A8_UNORM": "DXGI_FORMAT_B8G8R8A8_UNORM":
{ {
...@@ -1273,7 +1273,7 @@ ...@@ -1273,7 +1273,7 @@
"renderTarget": "check", "renderTarget": "check",
"multisampleRT": "check", "multisampleRT": "check",
"depthStencil": "never", "depthStencil": "never",
"mipAutoGen": "never" "mipAutoGen": "dxgi1_2"
} }
} }
] ]
src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
...@@ -74,12 +74,12 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat) ...@@ -74,12 +74,12 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B4G4R4A4_UNORM: case DXGI_FORMAT_B4G4R4A4_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G6R5_UNORM:
...@@ -554,7 +554,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat) ...@@ -554,7 +554,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_R8G8_UNORM: case DXGI_FORMAT_R8G8_UNORM:
{ {
static const DXGISupport info(0, F_DS, F_MS); static const DXGISupport info(0, F_DS, F_MS | F_RT | F_SAMPLE);
return info; return info;
} }
case DXGI_FORMAT_R8_SINT: case DXGI_FORMAT_R8_SINT:
...@@ -579,7 +579,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat) ...@@ -579,7 +579,7 @@ const DXGISupport &GetDXGISupport_9_3(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_R8_UNORM: case DXGI_FORMAT_R8_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_R9G9B9E5_SHAREDEXP: case DXGI_FORMAT_R9G9B9E5_SHAREDEXP:
...@@ -667,12 +667,12 @@ const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat) ...@@ -667,12 +667,12 @@ const DXGISupport &GetDXGISupport_10_0(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B4G4R4A4_UNORM: case DXGI_FORMAT_B4G4R4A4_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G6R5_UNORM:
...@@ -1260,12 +1260,12 @@ const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat) ...@@ -1260,12 +1260,12 @@ const DXGISupport &GetDXGISupport_10_1(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B4G4R4A4_UNORM: case DXGI_FORMAT_B4G4R4A4_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G6R5_UNORM:
...@@ -1853,12 +1853,12 @@ const DXGISupport &GetDXGISupport_11_0(DXGI_FORMAT dxgiFormat) ...@@ -1853,12 +1853,12 @@ const DXGISupport &GetDXGISupport_11_0(DXGI_FORMAT dxgiFormat)
} }
case DXGI_FORMAT_B4G4R4A4_UNORM: case DXGI_FORMAT_B4G4R4A4_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM:
{ {
static const DXGISupport info(F_2D | F_3D | F_CUBE | F_SAMPLE, F_DS | F_MIPGEN, F_MS | F_RT); static const DXGISupport info(F_2D | F_3D | F_CUBE | F_MIPGEN | F_SAMPLE, F_DS, F_MS | F_RT);
return info; return info;
} }
case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G6R5_UNORM:
......
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