third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp - Issue 1490043002: Implementing Blink-side validation for WebGL 2 Samplers

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/modules/webgl/WebGL2RenderingContextBase.cpp

Issue 1490043002: Implementing Blink-side validation for WebGL 2 Samplers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed zmo@'s new feedback Created 5 years 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/modules/webgl/WebGL2RenderingContextBase.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

index b7ac1724db73a9900f6466729d0dc524219d334b..6031254747f8a4357bb107f7318e08837d1d2667 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

@@ -3222,4 +3222,16 @@ GLenum WebGL2RenderingContextBase::boundFramebufferColorFormat()

return GL_RGB;

}

+const WebGLSamplerState* WebGL2RenderingContextBase::getTextureUnitSamplerState(GLenum target, GLuint unit) const

+ ASSERT(unit < m_samplerUnits.size());

+ WebGLSampler* sampler = m_samplerUnits[unit];

+ if (sampler)

+ return sampler->getSamplerState();

+ return WebGLRenderingContextBase::getTextureUnitSamplerState(target, unit);

} // namespace blink