aboutsummaryrefslogtreecommitdiff
path: root/src/libANGLE/renderer/d3d/ProgramD3D.cpp
diff options
context:
space:
mode:
authorandroid-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com>2022-04-19 22:19:28 +0000
committerandroid-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com>2022-04-19 22:19:28 +0000
commit6fb0b00ad2e695a76dd900cd0d025a6509056613 (patch)
treeb21d2eac62fed2ab6fe4f85a30cfbf0c36248db7 /src/libANGLE/renderer/d3d/ProgramD3D.cpp
parent345b350a2a729a37d0bd18d9a7cdbe91d86a23ee (diff)
parent55c21842b20406d02ce5181921b3100749c03b9a (diff)
downloadangle-6fb0b00ad2e695a76dd900cd0d025a6509056613.tar.gz
Roll ANGLE from cfc92ebf1f1e to 55c21842b204 (3 revisions)
https://chromium.googlesource.com/angle/angle.git/+log/cfc92ebf1f1e..55c21842b204 Please enable autosubmit on changes if possible when approving them. If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/angle-android-autoroll Please CC ianelliott@google.com on the revert to ensure that a human is aware of the problem. To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Test: Presubmit checks will test this change. Exempt-From-Owner-Approval: The autoroll bot does not require owner approval. Change-Id: Ie328f7c5bf83f6b501440c4e67750218ee699ec6
Diffstat (limited to 'src/libANGLE/renderer/d3d/ProgramD3D.cpp')
-rw-r--r--src/libANGLE/renderer/d3d/ProgramD3D.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index eb57441d9f..c25e355b21 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1544,7 +1544,8 @@ angle::Result ProgramD3D::getPixelExecutableForCachedOutputLayout(
std::string finalPixelHLSL = mDynamicHLSL->generatePixelShaderForOutputSignature(
mShaderHLSL[gl::ShaderType::Fragment], mPixelShaderKey, mUsesFragDepth,
- mPixelShaderOutputLayoutCache, mShaderStorageBlocks[gl::ShaderType::Fragment]);
+ mPixelShaderOutputLayoutCache, mShaderStorageBlocks[gl::ShaderType::Fragment],
+ mPixelShaderKey.size());
// Generate new pixel executable
ShaderExecutableD3D *pixelExecutable = nullptr;
@@ -1588,7 +1589,7 @@ angle::Result ProgramD3D::getVertexExecutableForCachedInputLayout(
// Generate new dynamic layout with attribute conversions
std::string finalVertexHLSL = mDynamicHLSL->generateVertexShaderForInputLayout(
mShaderHLSL[gl::ShaderType::Vertex], mCachedInputLayout, mState.getProgramInputs(),
- mShaderStorageBlocks[gl::ShaderType::Vertex], getNumPixelShaderOutputs());
+ mShaderStorageBlocks[gl::ShaderType::Vertex], mPixelShaderKey.size());
// Generate new vertex executable
ShaderExecutableD3D *vertexExecutable = nullptr;