summaryrefslogtreecommitdiff
path: root/chromium/third_party/skia/samplecode/Sample3D.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/skia/samplecode/Sample3D.cpp')
-rw-r--r--chromium/third_party/skia/samplecode/Sample3D.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/skia/samplecode/Sample3D.cpp b/chromium/third_party/skia/samplecode/Sample3D.cpp
index 51e3baeb4dc..0ee2c4cb5bd 100644
--- a/chromium/third_party/skia/samplecode/Sample3D.cpp
+++ b/chromium/third_party/skia/samplecode/Sample3D.cpp
@@ -356,20 +356,20 @@ class SampleBump3D : public SampleCubeBase {
SkRRect fRR;
public:
- SampleBump3D() : SampleCubeBase(kShowLightDome) {}
+ SampleBump3D() : SampleCubeBase(Flags(kCanRunOnCPU | kShowLightDome)) {}
SkString name() override { return SkString("bump3d"); }
void onOnceBeforeDraw() override {
fRR = SkRRect::MakeRectXY({20, 20, 380, 380}, 50, 50);
auto img = GetResourceAsImage("images/brickwork-texture.jpg");
- fImgShader = img->makeShader(SkMatrix::MakeScale(2, 2));
+ fImgShader = img->makeShader(SkMatrix::Scale(2, 2));
img = GetResourceAsImage("images/brickwork_normal-map.jpg");
- fBmpShader = img->makeShader(SkMatrix::MakeScale(2, 2));
+ fBmpShader = img->makeShader(SkMatrix::Scale(2, 2));
const char code[] = R"(
- in fragmentProcessor color_map;
- in fragmentProcessor normal_map;
+ in shader color_map;
+ in shader normal_map;
layout (marker=local_to_world) uniform float4x4 localToWorld;
layout (marker=normals(local_to_world)) uniform float4x4 localToWorldAdjInv;