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

Unified Diff: ui/gl/test/gl_image_test_support.cc

Issue 1484473003: gl, ozone: enable GLImageBindTest unittests Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase based on crrev.com/1879243002 Created 4 years, 8 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_support.cc
diff --git a/ui/gl/test/gl_image_test_support.cc b/ui/gl/test/gl_image_test_support.cc
index 79996d5edf11fc86a70cb6675bcef1de2bd4e3b4..2206f37b4ba5e1cc61df3da6299d42a02a3a9575 100644
--- a/ui/gl/test/gl_image_test_support.cc
+++ b/ui/gl/test/gl_image_test_support.cc
@@ -4,24 +4,16 @@
#include "ui/gl/test/gl_image_test_support.h"
+#include <stdio.h>
#include <vector>
#include "ui/gl/gl_implementation.h"
#include "ui/gl/test/gl_surface_test_support.h"
-#if defined(USE_OZONE)
-#include "base/message_loop/message_loop.h"
-#endif
-
namespace gl {
// static
void GLImageTestSupport::InitializeGL() {
-#if defined(USE_OZONE)
- // On Ozone, the backend initializes the event system using a UI thread.
- base::MessageLoopForUI main_loop;
-#endif
-
std::vector<gfx::GLImplementation> allowed_impls;
GetAllowedGLImplementations(&allowed_impls);
DCHECK(!allowed_impls.empty());
@@ -44,6 +36,12 @@ void GLImageTestSupport::SetBufferDataToColor(int width,
const uint8_t color[4],
uint8_t* data) {
switch (format) {
+ case gfx::BufferFormat::R_8:
+ DCHECK_EQ(0, plane);
+ for (int y = 0; y < height; ++y) {
+ memset(&data[y * stride], color[0], width);
+ }
+ return;
case gfx::BufferFormat::RGBX_8888:
DCHECK_EQ(0, plane);
for (int y = 0; y < height; ++y) {
@@ -120,7 +118,6 @@ void GLImageTestSupport::SetBufferDataToColor(int width,
case gfx::BufferFormat::DXT1:
case gfx::BufferFormat::DXT5:
case gfx::BufferFormat::ETC1:
- case gfx::BufferFormat::R_8:
case gfx::BufferFormat::RGBA_4444:
case gfx::BufferFormat::UYVY_422:
case gfx::BufferFormat::YUV_420:

Powered by Google App Engine
This is Rietveld 408576698