AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sksl spirv subpassLoad.

Browse Source 
Bug: skia:10409
Change-Id: If8fba41470eddc72b397f46e4e0bb7bd7f4a3d5d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315651
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Greg Daniel 2020-09-08 15:25:23 -04:00 committed by Skia Commit-Bot
parent 27e7f77212
commit cf1a4f5012
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sksl/SkSLSPIRVCodeGenerator.cpp
View File

@ -851,9 +851,9 @@ SpvId SPIRVCodeGenerator::writeSpecialIntrinsic(const FunctionCall& c, SpecialIn
case kSubpassLoad_SpecialIntrinsic: { case kSubpassLoad_SpecialIntrinsic: {
SpvId img = this->writeExpression(*c.fArguments[0], out); SpvId img = this->writeExpression(*c.fArguments[0], out);
std::vector<std::unique_ptr<Expression>> args; std::vector<std::unique_ptr<Expression>> args;
args.emplace_back(new FloatLiteral(fContext, -1, 0.0)); args.emplace_back(new IntLiteral(fContext, -1, 0));
args.emplace_back(new FloatLiteral(fContext, -1, 0.0)); args.emplace_back(new IntLiteral(fContext, -1, 0));
Constructor ctor(-1, *fContext.fFloat2_Type, std::move(args)); Constructor ctor(-1, *fContext.fInt2_Type, std::move(args));
SpvId coords = this->writeConstantVector(ctor); SpvId coords = this->writeConstantVector(ctor);
if (1 == c.fArguments.size()) { if (1 == c.fArguments.size()) {
this->writeInstruction(SpvOpImageRead, this->writeInstruction(SpvOpImageRead,

2
src/sksl/generated/sksl_gpu.dehydrated.sksl
View File

File diff suppressed because one or more lines are too long

4
src/sksl/sksl_gpu.sksl
View File

@ -252,8 +252,8 @@ half4 sample($gsampler2DRect sampler, float3 P);
// Currently we do not support the generic types of loading subpassInput so we have some explicit // Currently we do not support the generic types of loading subpassInput so we have some explicit
// versions that we currently use // versions that we currently use
float4 subpassLoad(subpassInput subpass); half4 subpassLoad(subpassInput subpass);
float4 subpassLoad(subpassInputMS subpass, int sample); half4 subpassLoad(subpassInputMS subpass, int sample);
half4 sample($gsampler1D sampler, float2 P); half4 sample($gsampler1D sampler, float2 P);
half4 sample($gsampler1D sampler, float2 P, float bias); half4 sample($gsampler1D sampler, float2 P, float bias);