third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp - Issue 2121043002: 16 bpp video stream capture, render and WebGL usage - Realsense R200 & SR300 support.

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: third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp

Issue 2121043002: 16 bpp video stream capture, render and WebGL usage - Realsense R200 & SR300 support. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.h ('k') | third_party/WebKit/public/platform/WebMediaPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp b/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp

index 51f032e281b4632911f471c584ae1c0bc0593e19..d3c63f8af410e3b52435d32238014e4aca2ffe10 100644

--- a/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp

+++ b/third_party/WebKit/Source/platform/graphics/gpu/Extensions3DUtil.cpp

@@ -5,6 +5,8 @@

#include "platform/graphics/gpu/Extensions3DUtil.h"

#include "gpu/command_buffer/client/gles2_interface.h"

+#include "third_party/khronos/GLES2/gl2ext.h"

+#include "third_party/khronos/GLES3/gl3.h"

#include "wtf/PtrUtil.h"

#include "wtf/text/CString.h"

#include "wtf/text/StringHash.h"

@@ -80,8 +82,14 @@ bool Extensions3DUtil::canUseCopyTextureCHROMIUM(GLenum destTarget,

// TODO(zmo): restriction of (RGB || RGBA)/UNSIGNED_BYTE/(Level 0) should be

// lifted when GLES2Interface::CopyTextureCHROMIUM(...) are fully functional.

if (destTarget == GL_TEXTURE_2D &&

- (destFormat == GL_RGB || destFormat == GL_RGBA) &&

- destType == GL_UNSIGNED_BYTE && !level)

+ ((destType == GL_UNSIGNED_BYTE &&

+ (destFormat == GL_RGB || destFormat == GL_RGBA)) ||

+ (destType == GL_FLOAT &&

+ ((destFormat == GL_RGBA &&

+ supportsExtension("GL_CHROMIUM_color_buffer_float_rgba")) ||

+ (destFormat == GL_RGB &&

+ supportsExtension("GL_CHROMIUM_color_buffer_float_rgb"))))) &&

+ !level)

return true;

return false;

}