| Index: cc/output/shader.h
|
| diff --git a/cc/output/shader.h b/cc/output/shader.h
|
| index 561fe28d1049224634025531f857c3e9a52b4fa5..dcc01e2aec4b4b6ef69b12a821d3756271b4bf00 100644
|
| --- a/cc/output/shader.h
|
| +++ b/cc/output/shader.h
|
| @@ -774,7 +774,8 @@ class FragmentShaderYUVVideo : public FragmentTexBlendMode {
|
| int alpha_location() const { return alpha_location_; }
|
| int yuv_matrix_location() const { return yuv_matrix_location_; }
|
| int yuv_adj_location() const { return yuv_adj_location_; }
|
| - int clamp_rect_location() const { return clamp_rect_location_; }
|
| + int ya_clamp_rect_location() const { return ya_clamp_rect_location_; }
|
| + int uv_clamp_rect_location() const { return uv_clamp_rect_location_; }
|
|
|
| private:
|
| int y_texture_location_;
|
| @@ -783,7 +784,8 @@ class FragmentShaderYUVVideo : public FragmentTexBlendMode {
|
| int alpha_location_;
|
| int yuv_matrix_location_;
|
| int yuv_adj_location_;
|
| - int clamp_rect_location_;
|
| + int ya_clamp_rect_location_;
|
| + int uv_clamp_rect_location_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FragmentShaderYUVVideo);
|
| };
|
| @@ -807,7 +809,8 @@ class FragmentShaderYUVAVideo : public FragmentTexBlendMode {
|
| int alpha_location() const { return alpha_location_; }
|
| int yuv_matrix_location() const { return yuv_matrix_location_; }
|
| int yuv_adj_location() const { return yuv_adj_location_; }
|
| - int clamp_rect_location() const { return clamp_rect_location_; }
|
| + int ya_clamp_rect_location() const { return ya_clamp_rect_location_; }
|
| + int uv_clamp_rect_location() const { return uv_clamp_rect_location_; }
|
|
|
| private:
|
| int y_texture_location_;
|
| @@ -817,7 +820,8 @@ class FragmentShaderYUVAVideo : public FragmentTexBlendMode {
|
| int alpha_location_;
|
| int yuv_matrix_location_;
|
| int yuv_adj_location_;
|
| - int clamp_rect_location_;
|
| + int ya_clamp_rect_location_;
|
| + int uv_clamp_rect_location_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FragmentShaderYUVAVideo);
|
| };
|
|
|