Re-run ui/gl/generate_bindings.py

Several changes to the bindings [1] landed while the change that added the
mock writer was in review [2].  The mock writer wasn't rerun right before it
landed, so its output is out-of-sync with the bindings metadata.

Rerun the generator to fix things up. This is a prerequisite for a change
I want to make to the generator.

1: https://chromium-review.googlesource.com/c/chromium/src/+/766687,
   https://chromium-review.googlesource.com/c/chromium/src/+/779087
2: https://chromium-review.googlesource.com/c/chromium/src/+/772810

Bug: 761432,550065
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I1ad3658c8f92bdd587d1659bb21d58ac71a549f6
Reviewed-on: https://chromium-review.googlesource.com/953382Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541576}

ui/gl/egl_bindings_autogen_mock.cc

@@ -120,13 +120,13 @@ MockEGLInterface::Mock_eglCreateStreamKHR(EGLDisplay dpy,
 }
 
 EGLBoolean GL_BINDING_CALL
-MockEGLInterface::Mock_eglCreateStreamProducerD3DTextureNV12ANGLE(
+MockEGLInterface::Mock_eglCreateStreamProducerD3DTextureANGLE(
     EGLDisplay dpy,
     EGLStreamKHR stream,
     EGLAttrib* attrib_list) {
-  MakeFunctionUnique("eglCreateStreamProducerD3DTextureNV12ANGLE");
-  return interface_->CreateStreamProducerD3DTextureNV12ANGLE(dpy, stream,
-                                                             attrib_list);
+  MakeFunctionUnique("eglCreateStreamProducerD3DTextureANGLE");
+  return interface_->CreateStreamProducerD3DTextureANGLE(dpy, stream,
+                                                         attrib_list);
 }
 
 EGLSyncKHR GL_BINDING_CALL
@@ -184,6 +184,27 @@ MockEGLInterface::Mock_eglDupNativeFenceFDANDROID(EGLDisplay dpy,
   return interface_->DupNativeFenceFDANDROID(dpy, sync);
 }
 
+EGLBoolean GL_BINDING_CALL
+MockEGLInterface::Mock_eglExportDMABUFImageMESA(EGLDisplay dpy,
+                                                EGLImageKHR image,
+                                                int* fds,
+                                                EGLint* strides,
+                                                EGLint* offsets) {
+  MakeFunctionUnique("eglExportDMABUFImageMESA");
+  return interface_->ExportDMABUFImageMESA(dpy, image, fds, strides, offsets);
+}
+
+EGLBoolean GL_BINDING_CALL
+MockEGLInterface::Mock_eglExportDMABUFImageQueryMESA(EGLDisplay dpy,
+                                                     EGLImageKHR image,
+                                                     int* fourcc,
+                                                     int* num_planes,
+                                                     EGLuint64KHR* modifiers) {
+  MakeFunctionUnique("eglExportDMABUFImageQueryMESA");
+  return interface_->ExportDMABUFImageQueryMESA(dpy, image, fourcc, num_planes,
+                                                modifiers);
+}
+
 EGLBoolean GL_BINDING_CALL
 MockEGLInterface::Mock_eglGetCompositorTimingANDROID(EGLDisplay dpy,
                                                      EGLSurface surface,
@@ -501,15 +522,14 @@ MockEGLInterface::Mock_eglStreamConsumerReleaseKHR(EGLDisplay dpy,
   return interface_->StreamConsumerReleaseKHR(dpy, stream);
 }
 
-EGLBoolean GL_BINDING_CALL
-MockEGLInterface::Mock_eglStreamPostD3DTextureNV12ANGLE(
+EGLBoolean GL_BINDING_CALL MockEGLInterface::Mock_eglStreamPostD3DTextureANGLE(
     EGLDisplay dpy,
     EGLStreamKHR stream,
     void* texture,
     const EGLAttrib* attrib_list) {
-  MakeFunctionUnique("eglStreamPostD3DTextureNV12ANGLE");
-  return interface_->StreamPostD3DTextureNV12ANGLE(dpy, stream, texture,
-                                                   attrib_list);
+  MakeFunctionUnique("eglStreamPostD3DTextureANGLE");
+  return interface_->StreamPostD3DTextureANGLE(dpy, stream, texture,
+                                               attrib_list);
 }
 
 EGLBoolean GL_BINDING_CALL
@@ -599,9 +619,9 @@ MockEGLInterface::GetGLProcAddress(const char* name) {
     return reinterpret_cast<GLFunctionPointerType>(Mock_eglCreatePixmapSurface);
   if (strcmp(name, "eglCreateStreamKHR") == 0)
     return reinterpret_cast<GLFunctionPointerType>(Mock_eglCreateStreamKHR);
-  if (strcmp(name, "eglCreateStreamProducerD3DTextureNV12ANGLE") == 0)
+  if (strcmp(name, "eglCreateStreamProducerD3DTextureANGLE") == 0)
     return reinterpret_cast<GLFunctionPointerType>(
-        Mock_eglCreateStreamProducerD3DTextureNV12ANGLE);
+        Mock_eglCreateStreamProducerD3DTextureANGLE);
   if (strcmp(name, "eglCreateSyncKHR") == 0)
     return reinterpret_cast<GLFunctionPointerType>(Mock_eglCreateSyncKHR);
   if (strcmp(name, "eglCreateWindowSurface") == 0)
@@ -619,6 +639,12 @@ MockEGLInterface::GetGLProcAddress(const char* name) {
   if (strcmp(name, "eglDupNativeFenceFDANDROID") == 0)
     return reinterpret_cast<GLFunctionPointerType>(
         Mock_eglDupNativeFenceFDANDROID);
+  if (strcmp(name, "eglExportDMABUFImageMESA") == 0)
+    return reinterpret_cast<GLFunctionPointerType>(
+        Mock_eglExportDMABUFImageMESA);
+  if (strcmp(name, "eglExportDMABUFImageQueryMESA") == 0)
+    return reinterpret_cast<GLFunctionPointerType>(
+        Mock_eglExportDMABUFImageQueryMESA);
   if (strcmp(name, "eglGetCompositorTimingANDROID") == 0)
     return reinterpret_cast<GLFunctionPointerType>(
         Mock_eglGetCompositorTimingANDROID);
@@ -715,9 +741,9 @@ MockEGLInterface::GetGLProcAddress(const char* name) {
   if (strcmp(name, "eglStreamConsumerReleaseKHR") == 0)
     return reinterpret_cast<GLFunctionPointerType>(
         Mock_eglStreamConsumerReleaseKHR);
-  if (strcmp(name, "eglStreamPostD3DTextureNV12ANGLE") == 0)
+  if (strcmp(name, "eglStreamPostD3DTextureANGLE") == 0)
     return reinterpret_cast<GLFunctionPointerType>(
-        Mock_eglStreamPostD3DTextureNV12ANGLE);
+        Mock_eglStreamPostD3DTextureANGLE);
   if (strcmp(name, "eglSurfaceAttrib") == 0)
     return reinterpret_cast<GLFunctionPointerType>(Mock_eglSurfaceAttrib);
   if (strcmp(name, "eglSwapBuffers") == 0)

ui/gl/egl_bindings_autogen_mock.h

@@ -55,9 +55,9 @@ Mock_eglCreatePixmapSurface(EGLDisplay dpy,
 static EGLStreamKHR GL_BINDING_CALL
 Mock_eglCreateStreamKHR(EGLDisplay dpy, const EGLint* attrib_list);
 static EGLBoolean GL_BINDING_CALL
-Mock_eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy,
-                                                EGLStreamKHR stream,
-                                                EGLAttrib* attrib_list);
+Mock_eglCreateStreamProducerD3DTextureANGLE(EGLDisplay dpy,
+                                            EGLStreamKHR stream,
+                                            EGLAttrib* attrib_list);
 static EGLSyncKHR GL_BINDING_CALL
 Mock_eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint* attrib_list);
 static EGLSurface GL_BINDING_CALL
@@ -78,6 +78,18 @@ static EGLBoolean GL_BINDING_CALL Mock_eglDestroySyncKHR(EGLDisplay dpy,
 static EGLint GL_BINDING_CALL Mock_eglDupNativeFenceFDANDROID(EGLDisplay dpy,
                                                               EGLSyncKHR sync);
 static EGLBoolean GL_BINDING_CALL
+Mock_eglExportDMABUFImageMESA(EGLDisplay dpy,
+                              EGLImageKHR image,
+                              int* fds,
+                              EGLint* strides,
+                              EGLint* offsets);
+static EGLBoolean GL_BINDING_CALL
+Mock_eglExportDMABUFImageQueryMESA(EGLDisplay dpy,
+                                   EGLImageKHR image,
+                                   int* fourcc,
+                                   int* num_planes,
+                                   EGLuint64KHR* modifiers);
+static EGLBoolean GL_BINDING_CALL
 Mock_eglGetCompositorTimingANDROID(EGLDisplay dpy,
                                    EGLSurface surface,
                                    EGLint numTimestamps,
@@ -212,10 +224,10 @@ Mock_eglStreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream);
 static EGLBoolean GL_BINDING_CALL
 Mock_eglStreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream);
 static EGLBoolean GL_BINDING_CALL
-Mock_eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy,
-                                      EGLStreamKHR stream,
-                                      void* texture,
-                                      const EGLAttrib* attrib_list);
+Mock_eglStreamPostD3DTextureANGLE(EGLDisplay dpy,
+                                  EGLStreamKHR stream,
+                                  void* texture,
+                                  const EGLAttrib* attrib_list);
 static EGLBoolean GL_BINDING_CALL Mock_eglSurfaceAttrib(EGLDisplay dpy,
                                                         EGLSurface surface,
                                                         EGLint attribute,

ui/gl/gl_mock_autogen_egl.h

@@ -52,7 +52,7 @@ MOCK_METHOD4(CreatePixmapSurface,
                         const EGLint* attrib_list));
 MOCK_METHOD2(CreateStreamKHR,
              EGLStreamKHR(EGLDisplay dpy, const EGLint* attrib_list));
-MOCK_METHOD3(CreateStreamProducerD3DTextureNV12ANGLE,
+MOCK_METHOD3(CreateStreamProducerD3DTextureANGLE,
              EGLBoolean(EGLDisplay dpy,
                         EGLStreamKHR stream,
                         EGLAttrib* attrib_list));
@@ -71,6 +71,18 @@ MOCK_METHOD2(DestroyStreamKHR, EGLBoolean(EGLDisplay dpy, EGLStreamKHR stream));
 MOCK_METHOD2(DestroySurface, EGLBoolean(EGLDisplay dpy, EGLSurface surface));
 MOCK_METHOD2(DestroySyncKHR, EGLBoolean(EGLDisplay dpy, EGLSyncKHR sync));
 MOCK_METHOD2(DupNativeFenceFDANDROID, EGLint(EGLDisplay dpy, EGLSyncKHR sync));
+MOCK_METHOD5(ExportDMABUFImageMESA,
+             EGLBoolean(EGLDisplay dpy,
+                        EGLImageKHR image,
+                        int* fds,
+                        EGLint* strides,
+                        EGLint* offsets));
+MOCK_METHOD5(ExportDMABUFImageQueryMESA,
+             EGLBoolean(EGLDisplay dpy,
+                        EGLImageKHR image,
+                        int* fourcc,
+                        int* num_planes,
+                        EGLuint64KHR* modifiers));
 MOCK_METHOD5(GetCompositorTimingANDROID,
              EGLBoolean(EGLDisplay dpy,
                         EGLSurface surface,
@@ -206,7 +218,7 @@ MOCK_METHOD2(StreamConsumerGLTextureExternalKHR,
              EGLBoolean(EGLDisplay dpy, EGLStreamKHR stream));
 MOCK_METHOD2(StreamConsumerReleaseKHR,
              EGLBoolean(EGLDisplay dpy, EGLStreamKHR stream));
-MOCK_METHOD4(StreamPostD3DTextureNV12ANGLE,
+MOCK_METHOD4(StreamPostD3DTextureANGLE,
              EGLBoolean(EGLDisplay dpy,
                         EGLStreamKHR stream,
                         void* texture,