diff options
| author |  bsalomon <bsalomon@google.com> | 2015-04-24 07:38:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-24 07:38:43 -0700 |
| commit | 42d9f35a8daf7f24ba542ba3783ec46fd965ef2f (patch) | |
| tree | 2d59cdb9062451e68abe6b3cb341e8e5ad73e455 /src | |
| parent | aa31ee78eecef34128aa1eaf0e1bb9398a7caec5 (diff) | |
Remove validation exceptions in GrGLInterface. These are all now set by Chromium.
Review URL: https://codereview.chromium.org/1100413003
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLInterface.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index bc2600c90a..8d006178a9 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -115,10 +115,7 @@ bool GrGLInterface::validate() const { NULL == fFunctions.fBindBuffer || NULL == fFunctions.fBindTexture || NULL == fFunctions.fBlendColor || // -> GL >= 1.4 or extension, ES >= 2.0 -#if 0 - // TODO: Re-enable validation for fBlendEquation when Chrome has it hooked up. NULL == fFunctions.fBlendEquation || // -> GL >= 1.4 or extension, ES >= 2.0 -#endif NULL == fFunctions.fBlendFunc || NULL == fFunctions.fBufferData || NULL == fFunctions.fBufferSubData || @@ -278,9 +275,7 @@ bool GrGLInterface::validate() const { (glVer >= GR_GL_VER(1,3)) || fExtensions.has("GL_ARB_texture_compression")) { if (NULL == fFunctions.fCompressedTexImage2D -#if 0 || NULL == fFunctions.fCompressedTexSubImage2D -#endif ) { RETURN_FALSE_INTERFACE } @@ -325,23 +320,17 @@ bool GrGLInterface::validate() const { } } -// FIXME: Remove this once Chromium is updated to provide this function -#if 0 if (fExtensions.has("GL_KHR_blend_equation_advanced") || fExtensions.has("GL_NV_blend_equation_advanced")) { if (NULL == fFunctions.fBlendBarrier) { RETURN_FALSE_INTERFACE } } -#endif if (fExtensions.has("GL_EXT_discard_framebuffer")) { -// FIXME: Remove this once Chromium is updated to provide this function -#if 0 if (NULL == fFunctions.fDiscardFramebuffer) { RETURN_FALSE_INTERFACE } -#endif } // FBO MSAA @@ -490,11 +479,9 @@ bool GrGLInterface::validate() const { if (kGLES_GrGLStandard == fStandard || glVer >= GR_GL_VER(4,1) || fExtensions.has("GL_ARB_ES2_compatibility")) { -#if 0 // Enable this once Chrome gives us the function ptr if (NULL == fFunctions.fGetShaderPrecisionFormat) { RETURN_FALSE_INTERFACE } -#endif } if (fExtensions.has("GL_NV_path_rendering")) { |