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

Unified Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/test/fake_proxy.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index 4542d2a5893cd57e1fc55575a8f3e15c89018dcd..9bd75ac37c2baa39bcedaaa3571caf4e0e47f527 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -26,13 +26,12 @@ bool IsTestCaseSupported(PixelResourceTestCase test_case) {
case GL_ZERO_COPY_2D_DRAW:
case GL_ZERO_COPY_RECT_DRAW:
case GL_ONE_COPY_2D_STAGING_2D_DRAW:
+ case GL_ONE_COPY_RECT_STAGING_2D_DRAW:
case GL_ASYNC_UPLOAD_2D_DRAW:
return true;
case GL_ZERO_COPY_EXTERNAL_DRAW:
- case GL_ONE_COPY_RECT_STAGING_2D_DRAW:
case GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW:
// These should all be enabled in practice.
- // TODO(reveman): one copy with rect not supported in unit tests yet.
// TODO(enne): look into getting texture external oes enabled.
return false;
}
@@ -76,7 +75,7 @@ void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
case GL_ONE_COPY_RECT_STAGING_2D_DRAW:
test_type_ = PIXEL_TEST_GL;
staging_texture_target_ = GL_TEXTURE_RECTANGLE_ARB;
- draw_texture_target_ = GL_TEXTURE_RECTANGLE_ARB;
+ draw_texture_target_ = GL_TEXTURE_2D;
resource_pool_option_ = ONE_COPY_RASTER_WORKER_POOL;
return;
case GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW:
« no previous file with comments | « cc/test/fake_proxy.h ('k') | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698