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

Unified Diff: components/display_compositor/buffer_queue_unittest.cc

Issue 2388653002: gpu: Add CHROMIUM_texture_from_image spec and fence support.
Patch Set: rebase Created 4 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 | « components/display_compositor/buffer_queue.cc ('k') | components/exo/buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/display_compositor/buffer_queue_unittest.cc
diff --git a/components/display_compositor/buffer_queue_unittest.cc b/components/display_compositor/buffer_queue_unittest.cc
index 17ef79b0a8c3ccf4815ea7187d6e67d880a74ccd..95f42b36b82467dd0744a8e2b95388945d15df4f 100644
--- a/components/display_compositor/buffer_queue_unittest.cc
+++ b/components/display_compositor/buffer_queue_unittest.cc
@@ -230,7 +230,7 @@ class MockedContext : public cc::TestWebGraphicsContext3D {
}
MOCK_METHOD2(bindFramebuffer, void(GLenum, GLuint));
MOCK_METHOD2(bindTexture, void(GLenum, GLuint));
- MOCK_METHOD2(bindTexImage2DCHROMIUM, void(GLenum, GLint));
+ MOCK_METHOD3(bindTexImage2DCHROMIUM, void(GLenum, GLint, GLint));
MOCK_METHOD4(createImageCHROMIUM,
GLuint(ClientBuffer, GLsizei, GLsizei, GLenum));
MOCK_METHOD1(destroyImageCHROMIUM, void(GLuint));
@@ -309,7 +309,7 @@ TEST(BufferQueueStandaloneTest, FboBinding) {
EXPECT_CALL(*context, bindFramebuffer(GL_FRAMEBUFFER, Ne(0U)));
Expectation tex = EXPECT_CALL(*context, bindTexture(target, Ne(0U)));
Expectation bind_tex =
- EXPECT_CALL(*context, bindTexImage2DCHROMIUM(target, 1))
+ EXPECT_CALL(*context, bindTexImage2DCHROMIUM(target, 1, 0))
.After(tex, image);
EXPECT_CALL(*context,
framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
« no previous file with comments | « components/display_compositor/buffer_queue.cc ('k') | components/exo/buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698