Index: cc/output/gl_renderer.cc |
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc |
index d249a2f472054b60ac0151cc12d55f93c1e7e43f..855f06b7da885848af59910248293de549eac634 100644 |
--- a/cc/output/gl_renderer.cc |
+++ b/cc/output/gl_renderer.cc |
@@ -1066,7 +1066,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame, |
if (filter_bitmap.getTexture()) { |
GrTexture* texture = |
reinterpret_cast<GrTexture*>(filter_bitmap.getTexture()); |
- DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_)); |
+ DCHECK_EQ(GL_TEXTURE0, GLRenderer::GetActiveTextureUnit(gl_)); |
gl_->BindTexture(GL_TEXTURE_2D, texture->getTextureHandle()); |
} else { |
contents_resource_lock = |
@@ -1429,6 +1429,12 @@ bool GLRenderer::SetupQuadForAntialiasing( |
return true; |
} |
+GLint GLRenderer::GetActiveTextureUnit(GLES2Interface* gl) { |
+ GLint active_unit = 0; |
+ gl->GetIntegerv(GL_ACTIVE_TEXTURE, &active_unit); |
+ return active_unit; |
+} |
+ |
void GLRenderer::DrawSolidColorQuad(const DrawingFrame* frame, |
const SolidColorDrawQuad* quad) { |
gfx::Rect tile_rect = quad->visible_rect; |
@@ -1854,7 +1860,7 @@ void GLRenderer::DrawStreamVideoQuad(const DrawingFrame* frame, |
ResourceProvider::ScopedReadLockGL lock(resource_provider_, |
quad->resource_id); |
- DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_)); |
+ DCHECK_EQ(GL_TEXTURE0, GLRenderer::GetActiveTextureUnit(gl_)); |
GLC(gl_, gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id())); |
GLC(gl_, gl_->Uniform1i(program->fragment_shader().sampler_location(), 0)); |
@@ -1964,7 +1970,7 @@ void GLRenderer::FlushTextureQuadCache() { |
// Assume the current active textures is 0. |
ResourceProvider::ScopedReadLockGL locked_quad(resource_provider_, |
draw_cache_.resource_id); |
- DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_)); |
+ DCHECK_EQ(GL_TEXTURE0, GLRenderer::GetActiveTextureUnit(gl_)); |
GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, locked_quad.texture_id())); |
COMPILE_ASSERT(sizeof(Float4) == 4 * sizeof(float), struct_is_densely_packed); |
@@ -2113,7 +2119,7 @@ void GLRenderer::DrawIOSurfaceQuad(const DrawingFrame* frame, |
ResourceProvider::ScopedReadLockGL lock(resource_provider_, |
quad->io_surface_resource_id); |
- DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_)); |
+ DCHECK_EQ(GL_TEXTURE0, GLRenderer::GetActiveTextureUnit(gl_)); |
GLC(gl_, gl_->BindTexture(GL_TEXTURE_RECTANGLE_ARB, lock.texture_id())); |
DrawQuadGeometry( |
@@ -2266,7 +2272,7 @@ void GLRenderer::CopyTextureToFramebuffer(const DrawingFrame* frame, |
} |
SetShaderOpacity(1.f, program->fragment_shader().alpha_location()); |
- DCHECK_EQ(GL_TEXTURE0, ResourceProvider::GetActiveTextureUnit(gl_)); |
+ DCHECK_EQ(GL_TEXTURE0, GLRenderer::GetActiveTextureUnit(gl_)); |
GLC(gl_, gl_->BindTexture(GL_TEXTURE_2D, texture_id)); |
DrawQuadGeometry( |
frame, draw_matrix, rect, program->vertex_shader().matrix_location()); |