Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit cc958e0

Browse files
null77Commit Bot
null77
authored and
Commit Bot
committed
Remove D3D9 configs from perf tests.
We are not maintaining D3D9 for performance and reducing the number of perf tests will speed up the bots. Bug: angleproject:4943 Change-Id: Ib4ddad2cbfefcf6fccf3307df3bac7565ef246f4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2352478 Reviewed-by: Yuly Novikov <[email protected]> Commit-Queue: Jamie Madill <[email protected]>
1 parent 5276639 commit cc958e0

11 files changed

+3
-105
lines changed

‎src/tests/perf_tests/BindingPerf.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,6 @@ BindingsParams D3D11Params(AllocationStyle allocationStyle)
193193
return params;
194194
}
195195

196-
BindingsParams D3D9Params(AllocationStyle allocationStyle)
197-
{
198-
BindingsParams params;
199-
params.eglParameters = egl_platform::D3D9_NULL();
200-
params.allocationStyle = allocationStyle;
201-
return params;
202-
}
203-
204196
BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle)
205197
{
206198
BindingsParams params;
@@ -225,8 +217,6 @@ TEST_P(BindingsBenchmark, Run)
225217
ANGLE_INSTANTIATE_TEST(BindingsBenchmark,
226218
D3D11Params(EVERY_ITERATION),
227219
D3D11Params(AT_INITIALIZATION),
228-
D3D9Params(EVERY_ITERATION),
229-
D3D9Params(AT_INITIALIZATION),
230220
OpenGLOrGLESParams(EVERY_ITERATION),
231221
OpenGLOrGLESParams(AT_INITIALIZATION),
232222
VulkanParams(EVERY_ITERATION),

‎src/tests/perf_tests/BufferSubData.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,16 +350,6 @@ BufferSubDataParams BufferUpdateD3D11Params()
350350
return params;
351351
}
352352

353-
BufferSubDataParams BufferUpdateD3D9Params()
354-
{
355-
BufferSubDataParams params;
356-
params.eglParameters = egl_platform::D3D9();
357-
params.vertexType = GL_FLOAT;
358-
params.vertexComponentCount = 4;
359-
params.vertexNormalized = GL_FALSE;
360-
return params;
361-
}
362-
363353
BufferSubDataParams BufferUpdateOpenGLOrGLESParams()
364354
{
365355
BufferSubDataParams params;
@@ -387,7 +377,6 @@ TEST_P(BufferSubDataBenchmark, Run)
387377

388378
ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark,
389379
BufferUpdateD3D11Params(),
390-
BufferUpdateD3D9Params(),
391380
BufferUpdateOpenGLOrGLESParams(),
392381
BufferUpdateVulkanParams());
393382

‎src/tests/perf_tests/DrawCallPerfParams.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ struct DrawCallPerfParams : public RenderTestParams
2929

3030
namespace params
3131
{
32-
template <typename ParamsT>
33-
ParamsT D3D9(const ParamsT &in)
34-
{
35-
ParamsT out = in;
36-
out.eglParameters = angle::egl_platform::D3D9();
37-
return out;
38-
}
39-
4032
template <typename ParamsT>
4133
ParamsT D3D11(const ParamsT &in)
4234
{

‎src/tests/perf_tests/DynamicPromotionPerfTest.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,10 @@ DynamicPromotionParams DynamicPromotionD3D11Params()
166166
return params;
167167
}
168168

169-
DynamicPromotionParams DynamicPromotionD3D9Params()
170-
{
171-
DynamicPromotionParams params;
172-
params.eglParameters = egl_platform::D3D9();
173-
return params;
174-
}
175-
176169
TEST_P(DynamicPromotionPerfTest, Run)
177170
{
178171
run();
179172
}
180173

181-
ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest,
182-
DynamicPromotionD3D11Params(),
183-
DynamicPromotionD3D9Params());
174+
ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest, DynamicPromotionD3D11Params());
184175
} // anonymous namespace

‎src/tests/perf_tests/EGLMakeCurrentPerf.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,13 @@ TEST_P(EGLMakeCurrentPerfTest, Run)
147147

148148
#if !defined(ANGLE_PLATFORM_ANDROID)
149149
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest,
150-
angle::ES2_D3D9(),
151150
angle::ES2_D3D11(),
152151
angle::ES2_METAL(),
153152
angle::ES2_OPENGL(),
154153
angle::ES2_OPENGLES(),
155154
angle::ES2_VULKAN());
156155
#else
157-
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, angle::ES2_D3D9(), angle::ES2_D3D11());
156+
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest, angle::ES2_D3D11());
158157
#endif
159158

160159
} // namespace

‎src/tests/perf_tests/InstancingPerf.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,13 +330,6 @@ InstancingPerfParams InstancingPerfD3D11Params()
330330
return params;
331331
}
332332

333-
InstancingPerfParams InstancingPerfD3D9Params()
334-
{
335-
InstancingPerfParams params;
336-
params.eglParameters = D3D9();
337-
return params;
338-
}
339-
340333
InstancingPerfParams InstancingPerfOpenGLOrGLESParams()
341334
{
342335
InstancingPerfParams params;
@@ -351,7 +344,6 @@ TEST_P(InstancingPerfBenchmark, Run)
351344

352345
ANGLE_INSTANTIATE_TEST(InstancingPerfBenchmark,
353346
InstancingPerfD3D11Params(),
354-
InstancingPerfD3D9Params(),
355347
InstancingPerfOpenGLOrGLESParams());
356348

357349
} // anonymous namespace

‎src/tests/perf_tests/InterleavedAttributeData.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -212,20 +212,6 @@ InterleavedAttributeDataParams D3D11Params()
212212
return params;
213213
}
214214

215-
InterleavedAttributeDataParams D3D11_9_3Params()
216-
{
217-
InterleavedAttributeDataParams params;
218-
params.eglParameters = egl_platform::D3D11_FL9_3();
219-
return params;
220-
}
221-
222-
InterleavedAttributeDataParams D3D9Params()
223-
{
224-
InterleavedAttributeDataParams params;
225-
params.eglParameters = egl_platform::D3D9();
226-
return params;
227-
}
228-
229215
InterleavedAttributeDataParams OpenGLOrGLESParams()
230216
{
231217
InterleavedAttributeDataParams params;
@@ -242,8 +228,6 @@ InterleavedAttributeDataParams VulkanParams()
242228

243229
ANGLE_INSTANTIATE_TEST(InterleavedAttributeDataBenchmark,
244230
D3D11Params(),
245-
D3D11_9_3Params(),
246-
D3D9Params(),
247231
OpenGLOrGLESParams(),
248232
VulkanParams());
249233

‎src/tests/perf_tests/LinkProgramPerfTest.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,6 @@ LinkProgramParams LinkProgramD3D11Params(TaskOption taskOption, ThreadOption thr
181181
return params;
182182
}
183183

184-
LinkProgramParams LinkProgramD3D9Params(TaskOption taskOption, ThreadOption threadOption)
185-
{
186-
LinkProgramParams params(taskOption, threadOption);
187-
params.eglParameters = D3D9();
188-
return params;
189-
}
190-
191184
LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption)
192185
{
193186
LinkProgramParams params(taskOption, threadOption);
@@ -210,19 +203,15 @@ TEST_P(LinkProgramBenchmark, Run)
210203
ANGLE_INSTANTIATE_TEST(
211204
LinkProgramBenchmark,
212205
LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
213-
LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::MultiThread),
214206
LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
215207
LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::MultiThread),
216208
LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
217-
LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::MultiThread),
218209
LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
219210
LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::MultiThread),
220211
LinkProgramD3D11Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
221-
LinkProgramD3D9Params(TaskOption::CompileOnly, ThreadOption::SingleThread),
222212
LinkProgramOpenGLOrGLESParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
223213
LinkProgramVulkanParams(TaskOption::CompileOnly, ThreadOption::SingleThread),
224214
LinkProgramD3D11Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
225-
LinkProgramD3D9Params(TaskOption::CompileAndLink, ThreadOption::SingleThread),
226215
LinkProgramOpenGLOrGLESParams(TaskOption::CompileAndLink, ThreadOption::SingleThread),
227216
LinkProgramVulkanParams(TaskOption::CompileAndLink, ThreadOption::SingleThread));
228217

‎src/tests/perf_tests/PointSprites.cpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,6 @@ PointSpritesParams D3D11Params()
201201
return params;
202202
}
203203

204-
PointSpritesParams D3D9Params()
205-
{
206-
PointSpritesParams params;
207-
params.eglParameters = egl_platform::D3D9();
208-
return params;
209-
}
210-
211204
PointSpritesParams OpenGLOrGLESParams()
212205
{
213206
PointSpritesParams params;
@@ -229,8 +222,4 @@ TEST_P(PointSpritesBenchmark, Run)
229222
run();
230223
}
231224

232-
ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark,
233-
D3D11Params(),
234-
D3D9Params(),
235-
OpenGLOrGLESParams(),
236-
VulkanParams());
225+
ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark, D3D11Params(), OpenGLOrGLESParams(), VulkanParams());

‎src/tests/perf_tests/TextureSampling.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,6 @@ TextureSamplingParams D3D11Params()
311311
return params;
312312
}
313313

314-
TextureSamplingParams D3D9Params()
315-
{
316-
TextureSamplingParams params;
317-
params.eglParameters = egl_platform::D3D9();
318-
return params;
319-
}
320-
321314
TextureSamplingParams OpenGLOrGLESParams()
322315
{
323316
TextureSamplingParams params;
@@ -346,7 +339,6 @@ TEST_P(TextureSamplingMutableFormatBenchmark, Run)
346339

347340
ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark,
348341
D3D11Params(),
349-
D3D9Params(),
350342
OpenGLOrGLESParams(),
351343
VulkanParams());
352344

‎src/tests/perf_tests/TexturesPerf.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,6 @@ TexturesParams D3D11Params(bool webglCompat)
281281
return params;
282282
}
283283

284-
TexturesParams D3D9Params(bool webglCompat)
285-
{
286-
TexturesParams params;
287-
params.eglParameters = egl_platform::D3D9_NULL();
288-
params.webgl = webglCompat;
289-
return params;
290-
}
291-
292284
TexturesParams OpenGLOrGLESParams(bool webglCompat)
293285
{
294286
TexturesParams params;
@@ -313,7 +305,6 @@ TEST_P(TexturesBenchmark, Run)
313305
ANGLE_INSTANTIATE_TEST(TexturesBenchmark,
314306
D3D11Params(false),
315307
D3D11Params(true),
316-
D3D9Params(true),
317308
OpenGLOrGLESParams(false),
318309
OpenGLOrGLESParams(true),
319310
VulkanParams(false),

0 commit comments

Comments
 (0)