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

Unified Diff: ui/gl/test/gl_image_test_template.h

Issue 1419733005: gpu: Add YCbCr 420v extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on master. Add gl/gfx namespace qualifiers. Created 5 years, 2 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
Index: ui/gl/test/gl_image_test_template.h
diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h
index fc09d428bc7b0f5fbd79e0b866c06a068ed05ece..06bc8c20d35a92ee139d4becbf064284704d107a 100644
--- a/ui/gl/test/gl_image_test_template.h
+++ b/ui/gl/test/gl_image_test_template.h
@@ -17,6 +17,7 @@
#include "ui/gfx/buffer_types.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_helper.h"
#include "ui/gl/gl_image.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_surface.h"
@@ -89,7 +90,7 @@ TYPED_TEST_CASE_P(GLImageCopyTest);
TYPED_TEST_P(GLImageCopyTest, CopyTexImage) {
const Size image_size(256, 256);
- const uint8_t image_color[] = {0xff, 0xff, 0, 0xff};
+ const uint8_t image_color[] = {0x10, 0x20, 0, 0xff};
reveman 2015/10/29 22:08:04 nit: can you add a comment here to explain why the
Daniele Castagna 2015/10/30 23:51:57 Done.
const uint8_t texture_color[] = {0, 0, 0xff, 0xff};
GLuint framebuffer =
@@ -145,15 +146,14 @@ TYPED_TEST_P(GLImageCopyTest, CopyTexImage) {
);
// clang-format on
- GLuint vertex_shader =
- GLTestHelper::LoadShader(GL_VERTEX_SHADER, kVertexShader);
+ GLuint vertex_shader = GLHelper::LoadShader(GL_VERTEX_SHADER, kVertexShader);
bool is_gles = GetGLImplementation() == kGLImplementationEGLGLES2;
- GLuint fragment_shader = GLTestHelper::LoadShader(
+ GLuint fragment_shader = GLHelper::LoadShader(
GL_FRAGMENT_SHADER,
base::StringPrintf("%s%s", is_gles ? kShaderFloatPrecision : "",
kFragmentShader)
.c_str());
- GLuint program = GLTestHelper::SetupProgram(vertex_shader, fragment_shader);
+ GLuint program = GLHelper::SetupProgram(vertex_shader, fragment_shader);
EXPECT_NE(program, 0u);
glUseProgram(program);

Powered by Google App Engine
This is Rietveld 408576698