OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <GLES2/gl2.h> | 5 #include <GLES2/gl2.h> |
6 #include <GLES2/gl2ext.h> | 6 #include <GLES2/gl2ext.h> |
7 | 7 |
8 #include <android/native_window_jni.h> | 8 #include <android/native_window_jni.h> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 | 32 |
33 GLManager gl_; | 33 GLManager gl_; |
34 }; | 34 }; |
35 | 35 |
36 TEST_F(GLSurfaceTextureTest, SimpleTest) { | 36 TEST_F(GLSurfaceTextureTest, SimpleTest) { |
37 // TODO(sievers): Eliminate the need for this by using a client-side | 37 // TODO(sievers): Eliminate the need for this by using a client-side |
38 // abstraction for the SurfaceTexture in this test. | 38 // abstraction for the SurfaceTexture in this test. |
39 GLuint texture = 0xFEEDBEEF; | 39 GLuint texture = 0xFEEDBEEF; |
40 | 40 |
41 scoped_refptr<gfx::SurfaceTexture> surface_texture( | 41 scoped_refptr<gfx::SurfaceTexture> surface_texture( |
42 new gfx::SurfaceTexture(texture)); | 42 gfx::SurfaceTexture::Create(texture)); |
43 gfx::AcceleratedWidget window = surface_texture->CreateSurface(); | 43 gfx::AcceleratedWidget window = surface_texture->CreateSurface(); |
44 EXPECT_TRUE(window != NULL); | 44 EXPECT_TRUE(window != NULL); |
45 | 45 |
46 scoped_refptr<gfx::GLSurface> gl_surface = | 46 scoped_refptr<gfx::GLSurface> gl_surface = |
47 gfx::GLSurface::CreateViewGLSurface(window); | 47 gfx::GLSurface::CreateViewGLSurface(window); |
48 EXPECT_TRUE(gl_surface.get() != NULL); | 48 EXPECT_TRUE(gl_surface.get() != NULL); |
49 | 49 |
50 gl_.SetSurface(gl_surface.get()); | 50 gl_.SetSurface(gl_surface.get()); |
51 | 51 |
52 glClearColor(0.0f, 1.0f, 0.0f, 1.0f); | 52 glClearColor(0.0f, 1.0f, 0.0f, 1.0f); |
53 glClear(GL_COLOR_BUFFER_BIT); | 53 glClear(GL_COLOR_BUFFER_BIT); |
54 // glSwapBuffers(); | 54 // glSwapBuffers(); |
55 | 55 |
56 surface_texture->UpdateTexImage(); | 56 surface_texture->UpdateTexImage(); |
57 | 57 |
58 GLTestHelper::CheckGLError("no errors", __LINE__); | 58 GLTestHelper::CheckGLError("no errors", __LINE__); |
59 | 59 |
60 ANativeWindow_release(window); | 60 ANativeWindow_release(window); |
61 } | 61 } |
62 | 62 |
63 } // namespace gpu | 63 } // namespace gpu |
64 | 64 |
OLD | NEW |