Skip to content

A
angle
Commit 05ba83a0 by Jamie Madill Committed by Commit Bot
Options

Refactor DrawCallPerfParams.

Makes it a bit easier to work with. In prep for adding offscreen configs. Bug: angleproject:3117 Change-Id: Ie2497574b2687592b7b3df2f7b933a19e83b6d16 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1650784 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent b08d53d3
Showing with 119 additions and 87 deletions
src/tests/perf_tests/BindingPerf.cpp
...@@ -196,7 +196,7 @@ BindingsParams D3D9Params(AllocationStyle allocationStyle) ...@@ -196,7 +196,7 @@ BindingsParams D3D9Params(AllocationStyle allocationStyle)
BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle) BindingsParams OpenGLOrGLESParams(AllocationStyle allocationStyle)
{ {
BindingsParams params; BindingsParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(true); params.eglParameters = egl_platform::OPENGL_OR_GLES_NULL();
params.allocationStyle = allocationStyle; params.allocationStyle = allocationStyle;
return params; return params;
} }
......
src/tests/perf_tests/BufferSubData.cpp
...@@ -363,7 +363,7 @@ BufferSubDataParams BufferUpdateD3D9Params() ...@@ -363,7 +363,7 @@ BufferSubDataParams BufferUpdateD3D9Params()
BufferSubDataParams BufferUpdateOpenGLOrGLESParams() BufferSubDataParams BufferUpdateOpenGLOrGLESParams()
{ {
BufferSubDataParams params; BufferSubDataParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
params.vertexType = GL_FLOAT; params.vertexType = GL_FLOAT;
params.vertexComponentCount = 4; params.vertexComponentCount = 4;
params.vertexNormalized = GL_FALSE; params.vertexNormalized = GL_FALSE;
......
src/tests/perf_tests/ClearPerf.cpp
...@@ -179,7 +179,7 @@ ClearParams D3D11Params() ...@@ -179,7 +179,7 @@ ClearParams D3D11Params()
ClearParams OpenGLOrGLESParams() ClearParams OpenGLOrGLESParams()
{ {
ClearParams params; ClearParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/DispatchComputePerf.cpp
...@@ -158,7 +158,8 @@ void DispatchComputePerfBenchmark::drawBenchmark() ...@@ -158,7 +158,8 @@ void DispatchComputePerfBenchmark::drawBenchmark()
DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevice) DispatchComputePerfParams DispatchComputePerfOpenGLOrGLESParams(bool useNullDevice)
{ {
DispatchComputePerfParams params; DispatchComputePerfParams params;
params.eglParameters = angle::egl_platform::OPENGL_OR_GLES(useNullDevice); params.eglParameters = useNullDevice ? angle::egl_platform::OPENGL_OR_GLES_NULL()
: angle::egl_platform::OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/DrawCallPerf.cpp
...@@ -180,7 +180,7 @@ void main() ...@@ -180,7 +180,7 @@ void main()
// Set the viewport // Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight()); glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
if (params.useFBO) if (params.offscreen)
{ {
CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mFBOTexture, &mFBO); CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mFBOTexture, &mFBO);
} }
...@@ -310,37 +310,38 @@ DrawArraysPerfParams DrawArrays(const DrawCallPerfParams &base, StateChange stat ...@@ -310,37 +310,38 @@ DrawArraysPerfParams DrawArrays(const DrawCallPerfParams &base, StateChange stat
return params; return params;
} }
ANGLE_INSTANTIATE_TEST( using namespace params;
DrawCallPerfBenchmark,
DrawArrays(DrawCallPerfD3D9Params(false, false), StateChange::NoChange), ANGLE_INSTANTIATE_TEST(DrawCallPerfBenchmark,
DrawArrays(DrawCallPerfD3D9Params(true, false), StateChange::NoChange), DrawArrays(DrawCallD3D9(), StateChange::NoChange),
DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::NoChange), DrawArrays(NullDevice(DrawCallD3D9()), StateChange::NoChange),
DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::NoChange), DrawArrays(DrawCallD3D11(), StateChange::NoChange),
DrawArrays(DrawCallPerfD3D11Params(true, true), StateChange::NoChange), DrawArrays(NullDevice(DrawCallD3D11()), StateChange::NoChange),
DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::VertexBuffer), DrawArrays(NullDevice(Offscreen(DrawCallD3D11())), StateChange::NoChange),
DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::VertexBuffer), DrawArrays(DrawCallD3D11(), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfD3D11Params(false, false), StateChange::Texture), DrawArrays(NullDevice(DrawCallD3D11()), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfD3D11Params(true, false), StateChange::Texture), DrawArrays(DrawCallD3D11(), StateChange::Texture),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::NoChange), DrawArrays(NullDevice(DrawCallD3D11()), StateChange::Texture),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::NoChange), DrawArrays(DrawCallOpenGL(), StateChange::NoChange),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, true), StateChange::NoChange), DrawArrays(NullDevice(DrawCallOpenGL()), StateChange::NoChange),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::VertexBuffer), DrawArrays(NullDevice(Offscreen(DrawCallOpenGL())), StateChange::NoChange),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::VertexBuffer), DrawArrays(DrawCallOpenGL(), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::ManyVertexBuffers), DrawArrays(NullDevice(DrawCallOpenGL()), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::ManyVertexBuffers), DrawArrays(DrawCallOpenGL(), StateChange::ManyVertexBuffers),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), StateChange::Texture), DrawArrays(NullDevice(DrawCallOpenGL()), StateChange::ManyVertexBuffers),
DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), StateChange::Texture), DrawArrays(DrawCallOpenGL(), StateChange::Texture),
DrawArrays(DrawCallPerfValidationOnly(), StateChange::NoChange), DrawArrays(NullDevice(DrawCallOpenGL()), StateChange::Texture),
DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::NoChange), DrawArrays(DrawCallValidation(), StateChange::NoChange),
DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::NoChange), DrawArrays(DrawCallVulkan(), StateChange::NoChange),
DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::VertexBuffer), DrawArrays(NullDevice(DrawCallVulkan()), StateChange::NoChange),
DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::VertexBuffer), DrawArrays(DrawCallVulkan(), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::ManyVertexBuffers), DrawArrays(NullDevice(DrawCallVulkan()), StateChange::VertexBuffer),
DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::ManyVertexBuffers), DrawArrays(DrawCallVulkan(), StateChange::ManyVertexBuffers),
DrawArrays(DrawCallPerfVulkanParams(false, false), StateChange::Texture), DrawArrays(NullDevice(DrawCallVulkan()), StateChange::ManyVertexBuffers),
DrawArrays(DrawCallPerfVulkanParams(true, false), StateChange::Texture), DrawArrays(DrawCallVulkan(), StateChange::Texture),
DrawArrays(DrawCallPerfWGLParams(false), StateChange::NoChange), DrawArrays(NullDevice(DrawCallVulkan()), StateChange::Texture),
DrawArrays(DrawCallPerfWGLParams(false), StateChange::VertexBuffer), DrawArrays(DrawCallWGL(), StateChange::NoChange),
DrawArrays(DrawCallPerfWGLParams(false), StateChange::Texture)); DrawArrays(DrawCallWGL(), StateChange::VertexBuffer),
DrawArrays(DrawCallWGL(), StateChange::Texture));
} // anonymous namespace } // anonymous namespace
src/tests/perf_tests/DrawCallPerfParams.cpp
...@@ -26,7 +26,7 @@ DrawCallPerfParams::DrawCallPerfParams() ...@@ -26,7 +26,7 @@ DrawCallPerfParams::DrawCallPerfParams()
#endif #endif
runTimeSeconds = 10.0; runTimeSeconds = 10.0;
numTris = 1; numTris = 1;
useFBO = false; offscreen = false;
} }
DrawCallPerfParams::~DrawCallPerfParams() = default; DrawCallPerfParams::~DrawCallPerfParams() = default;
...@@ -42,9 +42,9 @@ std::string DrawCallPerfParams::suffix() const ...@@ -42,9 +42,9 @@ std::string DrawCallPerfParams::suffix() const
strstr << "_validation_only"; strstr << "_validation_only";
} }
if (useFBO) if (offscreen)
{ {
strstr << "_render_to_texture"; strstr << "_offscreen";
} }
if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE) if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
...@@ -57,31 +57,30 @@ std::string DrawCallPerfParams::suffix() const ...@@ -57,31 +57,30 @@ std::string DrawCallPerfParams::suffix() const
using namespace angle::egl_platform; using namespace angle::egl_platform;
DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice, bool renderToTexture) namespace params
{
DrawCallPerfParams DrawCallD3D11()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.eglParameters = useNullDevice ? D3D11_NULL() : D3D11(); params.eglParameters = D3D11();
params.useFBO = renderToTexture;
return params; return params;
} }
DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice, bool renderToTexture) DrawCallPerfParams DrawCallD3D9()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.eglParameters = useNullDevice ? D3D9_NULL() : D3D9(); params.eglParameters = D3D9();
params.useFBO = renderToTexture;
return params; return params;
} }
DrawCallPerfParams DrawCallPerfOpenGLOrGLESParams(bool useNullDevice, bool renderToTexture) DrawCallPerfParams DrawCallOpenGL()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.eglParameters = OPENGL_OR_GLES(useNullDevice); params.eglParameters = OPENGL_OR_GLES();
params.useFBO = renderToTexture;
return params; return params;
} }
DrawCallPerfParams DrawCallPerfValidationOnly() DrawCallPerfParams DrawCallValidation()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.eglParameters = DEFAULT(); params.eglParameters = DEFAULT();
...@@ -90,18 +89,31 @@ DrawCallPerfParams DrawCallPerfValidationOnly() ...@@ -90,18 +89,31 @@ DrawCallPerfParams DrawCallPerfValidationOnly()
return params; return params;
} }
DrawCallPerfParams DrawCallPerfVulkanParams(bool useNullDevice, bool renderToTexture) DrawCallPerfParams DrawCallVulkan()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.eglParameters = useNullDevice ? VULKAN_NULL() : VULKAN(); params.eglParameters = VULKAN();
params.useFBO = renderToTexture;
return params; return params;
} }
DrawCallPerfParams DrawCallPerfWGLParams(bool renderToTexture) DrawCallPerfParams DrawCallWGL()
{ {
DrawCallPerfParams params; DrawCallPerfParams params;
params.useFBO = renderToTexture;
params.driver = angle::GLESDriverType::SystemWGL; params.driver = angle::GLESDriverType::SystemWGL;
return params; return params;
} }
DrawCallPerfParams Offscreen(const DrawCallPerfParams &input)
{
DrawCallPerfParams output = input;
output.offscreen = true;
return output;
}
DrawCallPerfParams NullDevice(const DrawCallPerfParams &input)
{
DrawCallPerfParams output = input;
output.eglParameters.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE;
return output;
}
} // namespace params
src/tests/perf_tests/DrawCallPerfParams.h
...@@ -24,14 +24,21 @@ struct DrawCallPerfParams : public RenderTestParams ...@@ -24,14 +24,21 @@ struct DrawCallPerfParams : public RenderTestParams
double runTimeSeconds; double runTimeSeconds;
int numTris; int numTris;
bool useFBO; bool offscreen;
}; };
DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice, bool renderToTexture); namespace params
DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice, bool renderToTexture); {
DrawCallPerfParams DrawCallPerfOpenGLOrGLESParams(bool useNullDevice, bool renderToTexture); DrawCallPerfParams DrawCallD3D11();
DrawCallPerfParams DrawCallPerfValidationOnly(); DrawCallPerfParams DrawCallD3D9();
DrawCallPerfParams DrawCallPerfVulkanParams(bool useNullDevice, bool renderToTexture); DrawCallPerfParams DrawCallOpenGL();
DrawCallPerfParams DrawCallPerfWGLParams(bool renderToTexture); DrawCallPerfParams DrawCallValidation();
DrawCallPerfParams DrawCallVulkan();
DrawCallPerfParams DrawCallWGL();
// Mixins.
DrawCallPerfParams Offscreen(const DrawCallPerfParams &input);
DrawCallPerfParams NullDevice(const DrawCallPerfParams &input);
} // namespace params
#endif // TESTS_PERF_TESTS_DRAW_CALL_PERF_PARAMS_H_ #endif // TESTS_PERF_TESTS_DRAW_CALL_PERF_PARAMS_H_
src/tests/perf_tests/DrawElementsPerf.cpp
...@@ -148,7 +148,7 @@ void DrawElementsPerfBenchmark::initializeBenchmark() ...@@ -148,7 +148,7 @@ void DrawElementsPerfBenchmark::initializeBenchmark()
// Set the viewport // Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight()); glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
if (params.useFBO) if (params.offscreen)
{ {
CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mTexture, &mFBO); CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mTexture, &mFBO);
} }
...@@ -237,7 +237,8 @@ DrawElementsPerfParams DrawElementsPerfOpenGLOrGLESParams(bool indexBufferChange ...@@ -237,7 +237,8 @@ DrawElementsPerfParams DrawElementsPerfOpenGLOrGLESParams(bool indexBufferChange
GLenum indexType) GLenum indexType)
{ {
DrawElementsPerfParams params; DrawElementsPerfParams params;
params.eglParameters = angle::egl_platform::OPENGL_OR_GLES(useNullDevice); params.eglParameters = useNullDevice ? angle::egl_platform::OPENGL_OR_GLES_NULL()
: angle::egl_platform::OPENGL_OR_GLES();
params.indexBufferChanged = indexBufferChanged; params.indexBufferChanged = indexBufferChanged;
params.type = indexType; params.type = indexType;
......
src/tests/perf_tests/InstancingPerf.cpp
...@@ -340,7 +340,7 @@ InstancingPerfParams InstancingPerfD3D9Params() ...@@ -340,7 +340,7 @@ InstancingPerfParams InstancingPerfD3D9Params()
InstancingPerfParams InstancingPerfOpenGLOrGLESParams() InstancingPerfParams InstancingPerfOpenGLOrGLESParams()
{ {
InstancingPerfParams params; InstancingPerfParams params;
params.eglParameters = OPENGL_OR_GLES(false); params.eglParameters = OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/InterleavedAttributeData.cpp
...@@ -229,7 +229,7 @@ InterleavedAttributeDataParams D3D9Params() ...@@ -229,7 +229,7 @@ InterleavedAttributeDataParams D3D9Params()
InterleavedAttributeDataParams OpenGLOrGLESParams() InterleavedAttributeDataParams OpenGLOrGLESParams()
{ {
InterleavedAttributeDataParams params; InterleavedAttributeDataParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/LinkProgramPerfTest.cpp
...@@ -191,7 +191,7 @@ LinkProgramParams LinkProgramD3D9Params(TaskOption taskOption, ThreadOption thre ...@@ -191,7 +191,7 @@ LinkProgramParams LinkProgramD3D9Params(TaskOption taskOption, ThreadOption thre
LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption) LinkProgramParams LinkProgramOpenGLOrGLESParams(TaskOption taskOption, ThreadOption threadOption)
{ {
LinkProgramParams params(taskOption, threadOption); LinkProgramParams params(taskOption, threadOption);
params.eglParameters = OPENGL_OR_GLES(false); params.eglParameters = OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/MultiviewPerf.cpp
...@@ -572,17 +572,17 @@ TEST_P(MultiviewCPUBoundBenchmark, Run) ...@@ -572,17 +572,17 @@ TEST_P(MultiviewCPUBoundBenchmark, Run)
ANGLE_INSTANTIATE_TEST( ANGLE_INSTANTIATE_TEST(
MultiviewCPUBoundBenchmark, MultiviewCPUBoundBenchmark,
NoAcceleration(egl_platform::OPENGL_OR_GLES(false), SmallWorkload(), ExtensionName::multiview), NoAcceleration(egl_platform::OPENGL_OR_GLES(), SmallWorkload(), ExtensionName::multiview),
NoAcceleration(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview), NoAcceleration(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview),
SelectViewInGeometryShader(SmallWorkload(), ExtensionName::multiview), SelectViewInGeometryShader(SmallWorkload(), ExtensionName::multiview),
SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(false), SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(),
SmallWorkload(), SmallWorkload(),
ExtensionName::multiview), ExtensionName::multiview),
SelectViewInVertexShader(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview), SelectViewInVertexShader(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview),
NoAcceleration(egl_platform::OPENGL_OR_GLES(false), SmallWorkload(), ExtensionName::multiview2), NoAcceleration(egl_platform::OPENGL_OR_GLES(), SmallWorkload(), ExtensionName::multiview2),
NoAcceleration(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview2), NoAcceleration(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview2),
SelectViewInGeometryShader(SmallWorkload(), ExtensionName::multiview2), SelectViewInGeometryShader(SmallWorkload(), ExtensionName::multiview2),
SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(false), SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(),
SmallWorkload(), SmallWorkload(),
ExtensionName::multiview2), ExtensionName::multiview2),
SelectViewInVertexShader(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview2)); SelectViewInVertexShader(egl_platform::D3D11(), SmallWorkload(), ExtensionName::multiview2));
...@@ -594,17 +594,17 @@ TEST_P(MultiviewGPUBoundBenchmark, Run) ...@@ -594,17 +594,17 @@ TEST_P(MultiviewGPUBoundBenchmark, Run)
ANGLE_INSTANTIATE_TEST( ANGLE_INSTANTIATE_TEST(
MultiviewGPUBoundBenchmark, MultiviewGPUBoundBenchmark,
NoAcceleration(egl_platform::OPENGL_OR_GLES(false), BigWorkload(), ExtensionName::multiview), NoAcceleration(egl_platform::OPENGL_OR_GLES(), BigWorkload(), ExtensionName::multiview),
NoAcceleration(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview), NoAcceleration(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview),
SelectViewInGeometryShader(BigWorkload(), ExtensionName::multiview), SelectViewInGeometryShader(BigWorkload(), ExtensionName::multiview),
SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(false), SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(),
BigWorkload(), BigWorkload(),
ExtensionName::multiview), ExtensionName::multiview),
SelectViewInVertexShader(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview), SelectViewInVertexShader(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview),
NoAcceleration(egl_platform::OPENGL_OR_GLES(false), BigWorkload(), ExtensionName::multiview2), NoAcceleration(egl_platform::OPENGL_OR_GLES(), BigWorkload(), ExtensionName::multiview2),
NoAcceleration(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview2), NoAcceleration(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview2),
SelectViewInGeometryShader(BigWorkload(), ExtensionName::multiview2), SelectViewInGeometryShader(BigWorkload(), ExtensionName::multiview2),
SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(false), SelectViewInVertexShader(egl_platform::OPENGL_OR_GLES(),
BigWorkload(), BigWorkload(),
ExtensionName::multiview2), ExtensionName::multiview2),
SelectViewInVertexShader(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview2)); SelectViewInVertexShader(egl_platform::D3D11(), BigWorkload(), ExtensionName::multiview2));
......
src/tests/perf_tests/PointSprites.cpp
...@@ -211,7 +211,7 @@ PointSpritesParams D3D9Params() ...@@ -211,7 +211,7 @@ PointSpritesParams D3D9Params()
PointSpritesParams OpenGLOrGLESParams() PointSpritesParams OpenGLOrGLESParams()
{ {
PointSpritesParams params; PointSpritesParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/TextureSampling.cpp
...@@ -275,7 +275,7 @@ TextureSamplingParams D3D9Params() ...@@ -275,7 +275,7 @@ TextureSamplingParams D3D9Params()
TextureSamplingParams OpenGLOrGLESParams() TextureSamplingParams OpenGLOrGLESParams()
{ {
TextureSamplingParams params; TextureSamplingParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
return params; return params;
} }
......
src/tests/perf_tests/TextureUploadPerf.cpp
...@@ -244,7 +244,7 @@ TextureUploadParams D3D11Params(bool webglCompat) ...@@ -244,7 +244,7 @@ TextureUploadParams D3D11Params(bool webglCompat)
TextureUploadParams OpenGLOrGLESParams(bool webglCompat) TextureUploadParams OpenGLOrGLESParams(bool webglCompat)
{ {
TextureUploadParams params; TextureUploadParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(false); params.eglParameters = egl_platform::OPENGL_OR_GLES();
params.webgl = webglCompat; params.webgl = webglCompat;
return params; return params;
} }
......
src/tests/perf_tests/TexturesPerf.cpp
...@@ -292,7 +292,7 @@ TexturesParams D3D9Params(bool webglCompat) ...@@ -292,7 +292,7 @@ TexturesParams D3D9Params(bool webglCompat)
TexturesParams OpenGLOrGLESParams(bool webglCompat) TexturesParams OpenGLOrGLESParams(bool webglCompat)
{ {
TexturesParams params; TexturesParams params;
params.eglParameters = egl_platform::OPENGL_OR_GLES(true); params.eglParameters = egl_platform::OPENGL_OR_GLES_NULL();
params.webgl = webglCompat; params.webgl = webglCompat;
return params; return params;
} }
......
src/tests/perf_tests/UniformsPerf.cpp
...@@ -409,9 +409,9 @@ ANGLE_INSTANTIATE_TEST(UniformsBenchmark, ...@@ -409,9 +409,9 @@ ANGLE_INSTANTIATE_TEST(UniformsBenchmark,
VectorUniforms(D3D11(), DataMode::REPEAT), VectorUniforms(D3D11(), DataMode::REPEAT),
VectorUniforms(D3D11(), DataMode::UPDATE), VectorUniforms(D3D11(), DataMode::UPDATE),
VectorUniforms(D3D11_NULL(), DataMode::UPDATE), VectorUniforms(D3D11_NULL(), DataMode::UPDATE),
VectorUniforms(OPENGL_OR_GLES(false), DataMode::UPDATE), VectorUniforms(OPENGL_OR_GLES(), DataMode::UPDATE),
VectorUniforms(OPENGL_OR_GLES(false), DataMode::REPEAT), VectorUniforms(OPENGL_OR_GLES(), DataMode::REPEAT),
VectorUniforms(OPENGL_OR_GLES(true), DataMode::UPDATE), VectorUniforms(OPENGL_OR_GLES_NULL(), DataMode::UPDATE),
MatrixUniforms(D3D11(), DataMode::UPDATE), MatrixUniforms(D3D11(), DataMode::UPDATE),
MatrixUniforms(OPENGL_OR_GLES(false), DataMode::UPDATE), MatrixUniforms(OPENGL_OR_GLES(), DataMode::UPDATE),
VectorUniforms(D3D11_NULL(), DataMode::REPEAT, ProgramMode::MULTIPLE)); VectorUniforms(D3D11_NULL(), DataMode::REPEAT, ProgramMode::MULTIPLE));
src/tests/test_utils/angle_test_configs.cpp
...@@ -365,12 +365,21 @@ EGLPlatformParameters OPENGLES_NULL() ...@@ -365,12 +365,21 @@ EGLPlatformParameters OPENGLES_NULL()
EGL_DONT_CARE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE); EGL_DONT_CARE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
} }
EGLPlatformParameters OPENGL_OR_GLES(bool useNullDevice) EGLPlatformParameters OPENGL_OR_GLES()
{ {
#if defined(ANGLE_PLATFORM_ANDROID) #if defined(ANGLE_PLATFORM_ANDROID)
return useNullDevice ? OPENGLES_NULL() : OPENGLES(); return OPENGLES();
#else #else
return useNullDevice ? OPENGL_NULL() : OPENGL(); return OPENGL();
#endif
}
EGLPlatformParameters OPENGL_OR_GLES_NULL()
{
#if defined(ANGLE_PLATFORM_ANDROID)
return OPENGLES_NULL();
#else
return OPENGL_NULL();
#endif #endif
} }
......
src/tests/test_utils/angle_test_configs.h
...@@ -106,7 +106,8 @@ EGLPlatformParameters OPENGLES(); ...@@ -106,7 +106,8 @@ EGLPlatformParameters OPENGLES();
EGLPlatformParameters OPENGLES(EGLint major, EGLint minor); EGLPlatformParameters OPENGLES(EGLint major, EGLint minor);
EGLPlatformParameters OPENGLES_NULL(); EGLPlatformParameters OPENGLES_NULL();
EGLPlatformParameters OPENGL_OR_GLES(bool useNullDevice); EGLPlatformParameters OPENGL_OR_GLES();
EGLPlatformParameters OPENGL_OR_GLES_NULL();
EGLPlatformParameters VULKAN(); EGLPlatformParameters VULKAN();
EGLPlatformParameters VULKAN_NULL(); EGLPlatformParameters VULKAN_NULL();
......
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