Remove old tokens for DMA-BUF import modifiers.

We have already landed the NVIDIA driver updates, so removing the temporary
workaround in chrome and the old token definitions in the header.

BUG=chrome-os-partner:58718
TEST=nyan_big boots to login
TBR=kbr@chromium.org

Review-Url: https://chromiumcodereview.appspot.com/2443703002
Cr-Commit-Position: refs/heads/master@{#426925}

third_party/khronos/EGL/eglext.h

@@ -576,14 +576,6 @@ typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC)(EGLDisplay dpy,
 #define EGL_YUV_NARROW_RANGE_EXT		0x3283
 #define EGL_YUV_CHROMA_SITING_0_EXT		0x3284
 #define EGL_YUV_CHROMA_SITING_0_5_EXT		0x3285
-// TODO(hshi): remove the old EGL_LINUX_DRM_PLANE*_MODIFIERS* tokens
-// after chrome uprevs and corresponding driver updates are complete
-#define EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT	0x3286
-#define EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT	0x3287
-#define EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT	0x3288
-#define EGL_LINUX_DRM_PLANE1_MODIFIER1_EXT	0x3289
-#define EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT	0x328a
-#define EGL_LINUX_DRM_PLANE2_MODIFIER1_EXT	0x328b
 #endif
 
 #ifndef EGL_EXT_image_dma_buf_import_modifiers

ui/ozone/gl/gl_image_ozone_native_pixmap.cc

@@ -186,43 +186,7 @@ bool GLImageOzoneNativePixmap::Initialize(NativePixmap* pixmap,
     if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
                                 static_cast<EGLClientBuffer>(nullptr),
                                 &attrs[0])) {
-      // TODO(hshi): remove this workaround after chrome uprevs and
-      // corresponding driver updates are made. https://crosbug.com/p/58718
-      if (has_dma_buf_import_modifier) {
-        // If driver rejects the new DMA-BUF import modifer tokens, then try
-        // again with the old token definition.
-        for (size_t i = 0; i < attrs.size(); i += 2) {
-          switch (attrs[i]) {
-            case EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE1_MODIFIER1_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT;
-              break;
-            case EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT:
-              attrs[i] = EGL_LINUX_DRM_PLANE2_MODIFIER1_EXT;
-              break;
-            default:
-              break;
-          }
-        }
-        if (!GLImageEGL::Initialize(EGL_LINUX_DMA_BUF_EXT,
-                                    static_cast<EGLClientBuffer>(nullptr),
-                                    &attrs[0])) {
-          return false;
-        }
-      } else {
-        return false;
-      }
+      return false;
     }
   }