Commit a588f582 authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot

Drop Version requirement of D3D11 to 11.0

Bug: 881922
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I9298701a3790ca2b7c9aaf43a6c9ce6c1abaa74c
Reviewed-on: https://chromium-review.googlesource.com/1241556
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: default avatarFrank Liberato <liberato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593723}
parent f889b9f0
...@@ -648,9 +648,9 @@ bool D3D11VideoDecoder::IsPotentiallySupported( ...@@ -648,9 +648,9 @@ bool D3D11VideoDecoder::IsPotentiallySupported(
// TODO(liberato): It would be nice to QueryD3D11DeviceObjectFromANGLE, but // TODO(liberato): It would be nice to QueryD3D11DeviceObjectFromANGLE, but
// we don't know what thread we're on. // we don't know what thread we're on.
// Make sure that we support at least 11.1. // Make sure that we support at least 11.0.
D3D_FEATURE_LEVEL levels[] = { D3D_FEATURE_LEVEL levels[] = {
D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0,
}; };
HRESULT hr = create_device_func_.Run( HRESULT hr = create_device_func_.Run(
nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0, levels, ARRAYSIZE(levels), nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, 0, levels, ARRAYSIZE(levels),
......
...@@ -123,7 +123,7 @@ class D3D11VideoDecoderTest : public ::testing::Test { ...@@ -123,7 +123,7 @@ class D3D11VideoDecoderTest : public ::testing::Test {
MOCK_METHOD1(MockInitCB, void(bool)); MOCK_METHOD1(MockInitCB, void(bool));
}; };
TEST_F(D3D11VideoDecoderTest, RequiresD3D11_1) { TEST_F(D3D11VideoDecoderTest, RequiresD3D11_0) {
D3D_FEATURE_LEVEL feature_levels[100]; D3D_FEATURE_LEVEL feature_levels[100];
int num_levels = 0; int num_levels = 0;
...@@ -149,12 +149,12 @@ TEST_F(D3D11VideoDecoderTest, RequiresD3D11_1) { ...@@ -149,12 +149,12 @@ TEST_F(D3D11VideoDecoderTest, RequiresD3D11_1) {
// Verify that it requests exactly 11.1, and nothing earlier. // Verify that it requests exactly 11.1, and nothing earlier.
// Later is okay. // Later is okay.
bool min_is_d3d11_1 = false; bool min_is_d3d11_0 = false;
for (int i = 0; i < num_levels; i++) { for (int i = 0; i < num_levels; i++) {
min_is_d3d11_1 |= feature_levels[i] == D3D_FEATURE_LEVEL_11_1; min_is_d3d11_0 |= feature_levels[i] == D3D_FEATURE_LEVEL_11_0;
ASSERT_TRUE(feature_levels[i] >= D3D_FEATURE_LEVEL_11_1); ASSERT_TRUE(feature_levels[i] >= D3D_FEATURE_LEVEL_11_0);
} }
ASSERT_TRUE(min_is_d3d11_1); ASSERT_TRUE(min_is_d3d11_0);
} }
TEST_F(D3D11VideoDecoderTest, OnlySupportsVP9WithFlagEnabled) { TEST_F(D3D11VideoDecoderTest, OnlySupportsVP9WithFlagEnabled) {
......
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