Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/output/gl_renderer.cc

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix gn for nacl Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 2612f10e98f17b7472f9ef31a04f70fcc1689538..5c560dc993b270021c7e236fbe4900191123f2a6 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -84,54 +84,54 @@ Float4 PremultipliedColor(SkColor color) {
SamplerType SamplerTypeFromTextureTarget(GLenum target) {
switch (target) {
case GL_TEXTURE_2D:
- return SamplerType2D;
+ return SAMPLER_TYPE_2D;
case GL_TEXTURE_RECTANGLE_ARB:
- return SamplerType2DRect;
+ return SAMPLER_TYPE_2D_RECT;
case GL_TEXTURE_EXTERNAL_OES:
- return SamplerTypeExternalOES;
+ return SAMPLER_TYPE_EXTERNAL_OES;
default:
NOTREACHED();
- return SamplerType2D;
+ return SAMPLER_TYPE_2D;
}
}
BlendMode BlendModeFromSkXfermode(SkXfermode::Mode mode) {
switch (mode) {
case SkXfermode::kSrcOver_Mode:
- return BlendModeNormal;
+ return BLEND_MODE_NORMAL;
case SkXfermode::kScreen_Mode:
- return BlendModeScreen;
+ return BLEND_MODE_SCREEN;
case SkXfermode::kOverlay_Mode:
- return BlendModeOverlay;
+ return BLEND_MODE_OVERLAY;
case SkXfermode::kDarken_Mode:
- return BlendModeDarken;
+ return BLEND_MODE_DARKEN;
case SkXfermode::kLighten_Mode:
- return BlendModeLighten;
+ return BLEND_MODE_LIGHTEN;
case SkXfermode::kColorDodge_Mode:
- return BlendModeColorDodge;
+ return BLEND_MODE_COLOR_DODGE;
case SkXfermode::kColorBurn_Mode:
- return BlendModeColorBurn;
+ return BLEND_MODE_COLOR_BURN;
case SkXfermode::kHardLight_Mode:
- return BlendModeHardLight;
+ return BLEND_MODE_HARD_LIGHT;
case SkXfermode::kSoftLight_Mode:
- return BlendModeSoftLight;
+ return BLEND_MODE_SOFT_LIGHT;
case SkXfermode::kDifference_Mode:
- return BlendModeDifference;
+ return BLEND_MODE_DIFFERENCE;
case SkXfermode::kExclusion_Mode:
- return BlendModeExclusion;
+ return BLEND_MODE_EXCLUSION;
case SkXfermode::kMultiply_Mode:
- return BlendModeMultiply;
+ return BLEND_MODE_MULTIPLY;
case SkXfermode::kHue_Mode:
- return BlendModeHue;
+ return BLEND_MODE_HUE;
case SkXfermode::kSaturation_Mode:
- return BlendModeSaturation;
+ return BLEND_MODE_SATURATION;
case SkXfermode::kColor_Mode:
- return BlendModeColor;
+ return BLEND_MODE_COLOR;
case SkXfermode::kLuminosity_Mode:
- return BlendModeLuminosity;
+ return BLEND_MODE_LUMINOSITY;
default:
NOTREACHED();
- return BlendModeNone;
+ return BLEND_MODE_NONE;
}
}
@@ -513,7 +513,8 @@ void GLRenderer::DoDrawQuad(DrawingFrame* frame, const DrawQuad* quad) {
DrawIOSurfaceQuad(frame, IOSurfaceDrawQuad::MaterialCast(quad));
break;
case DrawQuad::PICTURE_CONTENT:
- DrawPictureQuad(frame, PictureDrawQuad::MaterialCast(quad));
+ // PictureDrawQuad should only be used for resourceless software draws.
+ NOTREACHED();
break;
case DrawQuad::RENDER_PASS:
DrawRenderPassQuad(frame, RenderPassDrawQuad::MaterialCast(quad));
@@ -845,7 +846,7 @@ scoped_ptr<ScopedResource> GLRenderer::GetBackdropTexture(
ScopedResource::Create(resource_provider_);
// CopyTexImage2D fails when called on a texture having immutable storage.
device_background_texture->Allocate(
- bounding_rect.size(), ResourceProvider::TextureHintDefault, RGBA_8888);
+ bounding_rect.size(), ResourceProvider::TEXTURE_HINT_DEFAULT, RGBA_8888);
{
ResourceProvider::ScopedWriteLockGL lock(resource_provider_,
device_background_texture->id());
@@ -980,7 +981,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
scoped_ptr<ResourceProvider::ScopedSamplerGL> mask_resource_lock;
unsigned mask_texture_id = 0;
- SamplerType mask_sampler = SamplerTypeNA;
+ SamplerType mask_sampler = SAMPLER_TYPE_NA;
if (quad->mask_resource_id) {
mask_resource_lock.reset(new ResourceProvider::ScopedSamplerGL(
resource_provider_, quad->mask_resource_id, GL_TEXTURE1, GL_LINEAR));
@@ -1031,7 +1032,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
DCHECK_EQ(background_texture || background_image, use_shaders_for_blending);
BlendMode shader_blend_mode = use_shaders_for_blending
? BlendModeFromSkXfermode(blend_mode)
- : BlendModeNone;
+ : BLEND_MODE_NONE;
if (use_aa && mask_texture_id && !use_color_matrix) {
const RenderPassMaskProgramAA* program = GetRenderPassMaskProgramAA(
@@ -1218,7 +1219,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
GLC(gl_, gl_->Uniform1i(shader_mask_sampler_location, 1));
gfx::RectF mask_uv_rect = quad->MaskUVRect();
- if (mask_sampler != SamplerType2D) {
+ if (mask_sampler != SAMPLER_TYPE_2D) {
mask_uv_rect.Scale(quad->mask_texture_size.width(),
quad->mask_texture_size.height());
}
@@ -1637,7 +1638,7 @@ void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame,
float fragment_tex_scale_y = clamp_tex_rect.height();
// Map to normalized texture coordinates.
- if (sampler != SamplerType2DRect) {
+ if (sampler != SAMPLER_TYPE_2D_RECT) {
gfx::Size texture_size = quad->texture_size;
DCHECK(!texture_size.IsEmpty());
fragment_tex_translate_x /= texture_size.width();
@@ -1727,7 +1728,7 @@ void GLRenderer::DrawContentQuadNoAA(const DrawingFrame* frame,
float vertex_tex_scale_y = tex_coord_rect.height();
// Map to normalized texture coordinates.
- if (sampler != SamplerType2DRect) {
+ if (sampler != SAMPLER_TYPE_2D_RECT) {
gfx::Size texture_size = quad->texture_size;
DCHECK(!texture_size.IsEmpty());
vertex_tex_translate_x /= texture_size.width();
@@ -1899,9 +1900,12 @@ void GLRenderer::DrawYUVVideoQuad(const DrawingFrame* frame,
float yuv_to_rgb_rec601[9] = {
1.164f, 1.164f, 1.164f, 0.0f, -.391f, 2.018f, 1.596f, -.813f, 0.0f,
};
- float yuv_to_rgb_rec601_jpeg[9] = {
+ float yuv_to_rgb_jpeg[9] = {
1.f, 1.f, 1.f, 0.0f, -.34414f, 1.772f, 1.402f, -.71414f, 0.0f,
};
+ float yuv_to_rgb_rec709[9] = {
+ 1.164f, 1.164f, 1.164f, 0.0f, -0.213f, 2.112f, 1.793f, -0.533f, 0.0f,
+ };
// These values map to 16, 128, and 128 respectively, and are computed
// as a fraction over 256 (e.g. 16 / 256 = 0.0625).
@@ -1909,12 +1913,12 @@ void GLRenderer::DrawYUVVideoQuad(const DrawingFrame* frame,
// Y - 16 : Gives 16 values of head and footroom for overshooting
// U - 128 : Turns unsigned U into signed U [-128,127]
// V - 128 : Turns unsigned V into signed V [-128,127]
- float yuv_adjust_rec601[3] = {
+ float yuv_adjust_constrained[3] = {
-0.0625f, -0.5f, -0.5f,
};
// Same as above, but without the head and footroom.
- float yuv_adjust_rec601_jpeg[3] = {
+ float yuv_adjust_full[3] = {
0.0f, -0.5f, -0.5f,
};
@@ -1924,11 +1928,15 @@ void GLRenderer::DrawYUVVideoQuad(const DrawingFrame* frame,
switch (quad->color_space) {
case YUVVideoDrawQuad::REC_601:
yuv_to_rgb = yuv_to_rgb_rec601;
- yuv_adjust = yuv_adjust_rec601;
+ yuv_adjust = yuv_adjust_constrained;
+ break;
+ case YUVVideoDrawQuad::REC_709:
+ yuv_to_rgb = yuv_to_rgb_rec709;
+ yuv_adjust = yuv_adjust_constrained;
break;
- case YUVVideoDrawQuad::REC_601_JPEG:
- yuv_to_rgb = yuv_to_rgb_rec601_jpeg;
- yuv_adjust = yuv_adjust_rec601_jpeg;
+ case YUVVideoDrawQuad::JPEG:
+ yuv_to_rgb = yuv_to_rgb_jpeg;
+ yuv_adjust = yuv_adjust_full;
break;
}
@@ -1977,54 +1985,6 @@ void GLRenderer::DrawStreamVideoQuad(const DrawingFrame* frame,
program->vertex_shader().matrix_location());
}
-void GLRenderer::DrawPictureQuad(const DrawingFrame* frame,
- const PictureDrawQuad* quad) {
- if (on_demand_tile_raster_bitmap_.width() != quad->texture_size.width() ||
- on_demand_tile_raster_bitmap_.height() != quad->texture_size.height()) {
- on_demand_tile_raster_bitmap_.allocN32Pixels(quad->texture_size.width(),
- quad->texture_size.height());
-
- if (on_demand_tile_raster_resource_id_)
- resource_provider_->DeleteResource(on_demand_tile_raster_resource_id_);
-
- on_demand_tile_raster_resource_id_ = resource_provider_->CreateGLTexture(
- quad->texture_size,
- GL_TEXTURE_2D,
- GL_TEXTURE_POOL_UNMANAGED_CHROMIUM,
- GL_CLAMP_TO_EDGE,
- ResourceProvider::TextureHintImmutable,
- quad->texture_format);
- }
-
- SkCanvas canvas(on_demand_tile_raster_bitmap_);
- quad->raster_source->PlaybackToCanvas(&canvas, quad->content_rect,
- quad->contents_scale);
-
- uint8_t* bitmap_pixels = NULL;
- SkBitmap on_demand_tile_raster_bitmap_dest;
- SkColorType colorType = ResourceFormatToSkColorType(quad->texture_format);
- if (on_demand_tile_raster_bitmap_.colorType() != colorType) {
- on_demand_tile_raster_bitmap_.copyTo(&on_demand_tile_raster_bitmap_dest,
- colorType);
- // TODO(kaanb): The GL pipeline assumes a 4-byte alignment for the
- // bitmap data. This check will be removed once crbug.com/293728 is fixed.
- CHECK_EQ(0u, on_demand_tile_raster_bitmap_dest.rowBytes() % 4);
- bitmap_pixels = reinterpret_cast<uint8_t*>(
- on_demand_tile_raster_bitmap_dest.getPixels());
- } else {
- bitmap_pixels =
- reinterpret_cast<uint8_t*>(on_demand_tile_raster_bitmap_.getPixels());
- }
-
- resource_provider_->SetPixels(on_demand_tile_raster_resource_id_,
- bitmap_pixels,
- gfx::Rect(quad->texture_size),
- gfx::Rect(quad->texture_size),
- gfx::Vector2d());
-
- DrawContentQuad(frame, quad, on_demand_tile_raster_resource_id_);
-}
-
struct TextureProgramBinding {
template <class Program>
void Set(Program* program) {
@@ -2775,8 +2735,8 @@ GLRenderer::GetTileCheckerboardProgram() {
if (!tile_checkerboard_program_.initialized()) {
TRACE_EVENT0("cc", "GLRenderer::checkerboardProgram::initalize");
tile_checkerboard_program_.Initialize(output_surface_->context_provider(),
- TexCoordPrecisionNA,
- SamplerTypeNA);
+ TEX_COORD_PRECISION_NA,
+ SAMPLER_TYPE_NA);
}
return &tile_checkerboard_program_;
}
@@ -2785,8 +2745,7 @@ const GLRenderer::DebugBorderProgram* GLRenderer::GetDebugBorderProgram() {
if (!debug_border_program_.initialized()) {
TRACE_EVENT0("cc", "GLRenderer::debugBorderProgram::initialize");
debug_border_program_.Initialize(output_surface_->context_provider(),
- TexCoordPrecisionNA,
- SamplerTypeNA);
+ TEX_COORD_PRECISION_NA, SAMPLER_TYPE_NA);
}
return &debug_border_program_;
}
@@ -2795,8 +2754,7 @@ const GLRenderer::SolidColorProgram* GLRenderer::GetSolidColorProgram() {
if (!solid_color_program_.initialized()) {
TRACE_EVENT0("cc", "GLRenderer::solidColorProgram::initialize");
solid_color_program_.Initialize(output_surface_->context_provider(),
- TexCoordPrecisionNA,
- SamplerTypeNA);
+ TEX_COORD_PRECISION_NA, SAMPLER_TYPE_NA);
}
return &solid_color_program_;
}
@@ -2805,8 +2763,7 @@ const GLRenderer::SolidColorProgramAA* GLRenderer::GetSolidColorProgramAA() {
if (!solid_color_program_aa_.initialized()) {
TRACE_EVENT0("cc", "GLRenderer::solidColorProgramAA::initialize");
solid_color_program_aa_.Initialize(output_surface_->context_provider(),
- TexCoordPrecisionNA,
- SamplerTypeNA);
+ TEX_COORD_PRECISION_NA, SAMPLER_TYPE_NA);
}
return &solid_color_program_aa_;
}
@@ -2815,16 +2772,14 @@ const GLRenderer::RenderPassProgram* GLRenderer::GetRenderPassProgram(
TexCoordPrecision precision,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassProgram* program = &render_pass_program_[precision][blend_mode];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::renderPassProgram::initialize");
- program->Initialize(output_surface_->context_provider(),
- precision,
- SamplerType2D,
- blend_mode);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D, blend_mode);
}
return program;
}
@@ -2833,17 +2788,15 @@ const GLRenderer::RenderPassProgramAA* GLRenderer::GetRenderPassProgramAA(
TexCoordPrecision precision,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassProgramAA* program =
&render_pass_program_aa_[precision][blend_mode];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::renderPassProgramAA::initialize");
- program->Initialize(output_surface_->context_provider(),
- precision,
- SamplerType2D,
- blend_mode);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D, blend_mode);
}
return program;
}
@@ -2853,11 +2806,11 @@ const GLRenderer::RenderPassMaskProgram* GLRenderer::GetRenderPassMaskProgram(
SamplerType sampler,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassMaskProgram* program =
&render_pass_mask_program_[precision][sampler][blend_mode];
if (!program->initialized()) {
@@ -2873,11 +2826,11 @@ GLRenderer::GetRenderPassMaskProgramAA(TexCoordPrecision precision,
SamplerType sampler,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassMaskProgramAA* program =
&render_pass_mask_program_aa_[precision][sampler][blend_mode];
if (!program->initialized()) {
@@ -2892,17 +2845,15 @@ const GLRenderer::RenderPassColorMatrixProgram*
GLRenderer::GetRenderPassColorMatrixProgram(TexCoordPrecision precision,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassColorMatrixProgram* program =
&render_pass_color_matrix_program_[precision][blend_mode];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::renderPassColorMatrixProgram::initialize");
- program->Initialize(output_surface_->context_provider(),
- precision,
- SamplerType2D,
- blend_mode);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D, blend_mode);
}
return program;
}
@@ -2911,18 +2862,16 @@ const GLRenderer::RenderPassColorMatrixProgramAA*
GLRenderer::GetRenderPassColorMatrixProgramAA(TexCoordPrecision precision,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassColorMatrixProgramAA* program =
&render_pass_color_matrix_program_aa_[precision][blend_mode];
if (!program->initialized()) {
TRACE_EVENT0("cc",
"GLRenderer::renderPassColorMatrixProgramAA::initialize");
- program->Initialize(output_surface_->context_provider(),
- precision,
- SamplerType2D,
- blend_mode);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D, blend_mode);
}
return program;
}
@@ -2932,11 +2881,11 @@ GLRenderer::GetRenderPassMaskColorMatrixProgram(TexCoordPrecision precision,
SamplerType sampler,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassMaskColorMatrixProgram* program =
&render_pass_mask_color_matrix_program_[precision][sampler][blend_mode];
if (!program->initialized()) {
@@ -2953,11 +2902,11 @@ GLRenderer::GetRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision,
SamplerType sampler,
BlendMode blend_mode) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
DCHECK_GE(blend_mode, 0);
- DCHECK_LT(blend_mode, NumBlendModes);
+ DCHECK_LE(blend_mode, LAST_BLEND_MODE);
RenderPassMaskColorMatrixProgramAA* program =
&render_pass_mask_color_matrix_program_aa_[precision][sampler]
[blend_mode];
@@ -2974,9 +2923,9 @@ const GLRenderer::TileProgram* GLRenderer::GetTileProgram(
TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgram* program = &tile_program_[precision][sampler];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::tileProgram::initialize");
@@ -2990,9 +2939,9 @@ const GLRenderer::TileProgramOpaque* GLRenderer::GetTileProgramOpaque(
TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgramOpaque* program = &tile_program_opaque_[precision][sampler];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::tileProgramOpaque::initialize");
@@ -3006,9 +2955,9 @@ const GLRenderer::TileProgramAA* GLRenderer::GetTileProgramAA(
TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgramAA* program = &tile_program_aa_[precision][sampler];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::tileProgramAA::initialize");
@@ -3022,9 +2971,9 @@ const GLRenderer::TileProgramSwizzle* GLRenderer::GetTileProgramSwizzle(
TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgramSwizzle* program = &tile_program_swizzle_[precision][sampler];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::tileProgramSwizzle::initialize");
@@ -3038,9 +2987,9 @@ const GLRenderer::TileProgramSwizzleOpaque*
GLRenderer::GetTileProgramSwizzleOpaque(TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgramSwizzleOpaque* program =
&tile_program_swizzle_opaque_[precision][sampler];
if (!program->initialized()) {
@@ -3055,9 +3004,9 @@ const GLRenderer::TileProgramSwizzleAA* GLRenderer::GetTileProgramSwizzleAA(
TexCoordPrecision precision,
SamplerType sampler) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
DCHECK_GE(sampler, 0);
- DCHECK_LT(sampler, NumSamplerTypes);
+ DCHECK_LE(sampler, LAST_SAMPLER_TYPE);
TileProgramSwizzleAA* program = &tile_program_swizzle_aa_[precision][sampler];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::tileProgramSwizzleAA::initialize");
@@ -3070,12 +3019,12 @@ const GLRenderer::TileProgramSwizzleAA* GLRenderer::GetTileProgramSwizzleAA(
const GLRenderer::TextureProgram* GLRenderer::GetTextureProgram(
TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
TextureProgram* program = &texture_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::textureProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3083,14 +3032,14 @@ const GLRenderer::TextureProgram* GLRenderer::GetTextureProgram(
const GLRenderer::NonPremultipliedTextureProgram*
GLRenderer::GetNonPremultipliedTextureProgram(TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
NonPremultipliedTextureProgram* program =
&nonpremultiplied_texture_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc",
"GLRenderer::NonPremultipliedTextureProgram::Initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3098,12 +3047,12 @@ GLRenderer::GetNonPremultipliedTextureProgram(TexCoordPrecision precision) {
const GLRenderer::TextureBackgroundProgram*
GLRenderer::GetTextureBackgroundProgram(TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
TextureBackgroundProgram* program = &texture_background_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::textureProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3112,14 +3061,14 @@ const GLRenderer::NonPremultipliedTextureBackgroundProgram*
GLRenderer::GetNonPremultipliedTextureBackgroundProgram(
TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
NonPremultipliedTextureBackgroundProgram* program =
&nonpremultiplied_texture_background_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc",
"GLRenderer::NonPremultipliedTextureProgram::Initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3127,12 +3076,12 @@ GLRenderer::GetNonPremultipliedTextureBackgroundProgram(
const GLRenderer::TextureProgram* GLRenderer::GetTextureIOSurfaceProgram(
TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
TextureProgram* program = &texture_io_surface_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::textureIOSurfaceProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2DRect);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D_RECT);
}
return program;
}
@@ -3140,12 +3089,12 @@ const GLRenderer::TextureProgram* GLRenderer::GetTextureIOSurfaceProgram(
const GLRenderer::VideoYUVProgram* GLRenderer::GetVideoYUVProgram(
TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
VideoYUVProgram* program = &video_yuv_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::videoYUVProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3153,12 +3102,12 @@ const GLRenderer::VideoYUVProgram* GLRenderer::GetVideoYUVProgram(
const GLRenderer::VideoYUVAProgram* GLRenderer::GetVideoYUVAProgram(
TexCoordPrecision precision) {
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
VideoYUVAProgram* program = &video_yuva_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::videoYUVAProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerType2D);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_2D);
}
return program;
}
@@ -3168,13 +3117,13 @@ GLRenderer::GetVideoStreamTextureProgram(TexCoordPrecision precision) {
if (!Capabilities().using_egl_image)
return NULL;
DCHECK_GE(precision, 0);
- DCHECK_LT(precision, NumTexCoordPrecisions);
+ DCHECK_LE(precision, LAST_TEX_COORD_PRECISION);
VideoStreamTextureProgram* program =
&video_stream_texture_program_[precision];
if (!program->initialized()) {
TRACE_EVENT0("cc", "GLRenderer::streamTextureProgram::initialize");
- program->Initialize(
- output_surface_->context_provider(), precision, SamplerTypeExternalOES);
+ program->Initialize(output_surface_->context_provider(), precision,
+ SAMPLER_TYPE_EXTERNAL_OES);
}
return program;
}
@@ -3182,8 +3131,8 @@ GLRenderer::GetVideoStreamTextureProgram(TexCoordPrecision precision) {
void GLRenderer::CleanupSharedObjects() {
shared_geometry_ = nullptr;
- for (int i = 0; i < NumTexCoordPrecisions; ++i) {
- for (int j = 0; j < NumSamplerTypes; ++j) {
+ for (int i = 0; i <= LAST_TEX_COORD_PRECISION; ++i) {
+ for (int j = 0; j <= LAST_SAMPLER_TYPE; ++j) {
tile_program_[i][j].Cleanup(gl_);
tile_program_opaque_[i][j].Cleanup(gl_);
tile_program_swizzle_[i][j].Cleanup(gl_);
@@ -3191,14 +3140,14 @@ void GLRenderer::CleanupSharedObjects() {
tile_program_aa_[i][j].Cleanup(gl_);
tile_program_swizzle_aa_[i][j].Cleanup(gl_);
- for (int k = 0; k < NumBlendModes; k++) {
+ for (int k = 0; k <= LAST_BLEND_MODE; k++) {
render_pass_mask_program_[i][j][k].Cleanup(gl_);
render_pass_mask_program_aa_[i][j][k].Cleanup(gl_);
render_pass_mask_color_matrix_program_aa_[i][j][k].Cleanup(gl_);
render_pass_mask_color_matrix_program_[i][j][k].Cleanup(gl_);
}
}
- for (int j = 0; j < NumBlendModes; j++) {
+ for (int j = 0; j <= LAST_BLEND_MODE; j++) {
render_pass_program_[i][j].Cleanup(gl_);
render_pass_program_aa_[i][j].Cleanup(gl_);
render_pass_color_matrix_program_[i][j].Cleanup(gl_);
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698