ui/gl/gl_image_io_surface.mm - Issue 1741513002: Revert of gpu: Expose internal format R8 instead of RED.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_image_io_surface.mm

Issue 1741513002: Revert of gpu: Expose internal format R8 instead of RED. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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/gl_image_io_surface.mm

diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm

index 536ce6c92b30d1331d012bebb380783a4940c0a6..3059333cc8896feb96c15f2b4147e3e927a3f417 100644

--- a/ui/gl/gl_image_io_surface.mm

+++ b/ui/gl/gl_image_io_surface.mm

@@ -16,7 +16,6 @@

#include "ui/gl/gl_bindings.h"

#include "ui/gl/gl_context.h"

#include "ui/gl/gl_helper.h"

-#include "ui/gl/gl_version_info.h"

#include "ui/gl/scoped_binders.h"

// Note that this must be included after gl_bindings.h to avoid conflicts.

@@ -69,7 +68,7 @@

bool ValidInternalFormat(unsigned internalformat) {

switch (internalformat) {

- case GL_R8:

+ case GL_RED:

case GL_BGRA_EXT:

case GL_RGB:

case GL_RGB_YCBCR_420V_CHROMIUM:

@@ -108,9 +107,7 @@

GLenum TextureFormat(BufferFormat format) {

switch (format) {

case BufferFormat::R_8:

- return gfx::GLContext::GetCurrent()->GetVersionInfo()->IsES3Capable()

- ? GL_R8

- : GL_RED;

+ return GL_RED;

case BufferFormat::BGRA_8888:

case BufferFormat::RGBA_8888:

return GL_RGBA;

« no previous file with comments | « media/video/gpu_memory_buffer_video_frame_pool.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »