Revert "Implementation of EGL_KHR_swap_buffers_with_damage."

Bug 25161109

This reverts commit 810f99be7600e677c8723fe4f3267a6232b4e8a1.
It was only a workaround, which we no longer need after removing
the libandroid dependency which caused circular symbol resolves.

Change-Id: I0b486b5acfd328c0f64379e2c2dc2db00626738f
Reviewed-on: https://swiftshader-review.googlesource.com/4130
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/libEGL/exports.map b/src/OpenGL/libEGL/exports.map
index 1eac2a1..e41ac1e 100644 (file)
--- a/src/OpenGL/libEGL/exports.map
+++ b/src/OpenGL/libEGL/exports.map
@@ -45,7 +45,6 @@ global:
        eglDestroySyncKHR;\r
        eglClientWaitSyncKHR;\r
        eglGetSyncAttribKHR;\r
-       eglSwapBuffersWithDamageKHR;\r
 \r
        libEGL_swiftshader;\r
 \r

diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 3bdc42a..0b79fec 100644 (file)
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -179,7 +179,6 @@ const char *QueryString(EGLDisplay dpy, EGLint name)
                               "EGL_KHR_gl_renderbuffer_image "\r
                               "EGL_KHR_fence_sync "\r
                               "EGL_KHR_image_base "\r
-                              "EGL_KHR_swap_buffers_with_damage "\r
                               "EGL_ANDROID_framebuffer_target "\r
                               "EGL_ANDROID_recordable");\r
        case EGL_VENDOR:\r
@@ -945,11 +944,6 @@ EGLBoolean DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
        return success(EGL_TRUE);\r
 }\r
 \r
-EGLBoolean SwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects)\r
-{\r
-       return eglSwapBuffers(dpy, surface);   // FIXME: Pass damage rects to compositor for optimization\r
-}\r
-\r
 EGLDisplay GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)\r
 {\r
        TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list);\r
@@ -1115,7 +1109,6 @@ __eglMustCastToProperFunctionPointerType GetProcAddress(const char *procname)
                EXTENSION(eglDestroySyncKHR),\r
                EXTENSION(eglClientWaitSyncKHR),\r
                EXTENSION(eglGetSyncAttribKHR),\r
-               EXTENSION(eglSwapBuffersWithDamageKHR),\r
 \r
                #undef EXTENSION\r
        };\r

diff --git a/src/OpenGL/libEGL/libEGL.def b/src/OpenGL/libEGL/libEGL.def
index 6c5ae30..972d87c 100644 (file)
--- a/src/OpenGL/libEGL/libEGL.def
+++ b/src/OpenGL/libEGL/libEGL.def
@@ -45,6 +45,5 @@ EXPORTS
        eglDestroySyncKHR\r
        eglClientWaitSyncKHR\r
        eglGetSyncAttribKHR\r
-       eglSwapBuffersWithDamageKHR\r
 \r
        libEGL_swiftshader\r

diff --git a/src/OpenGL/libEGL/libEGL.hpp b/src/OpenGL/libEGL/libEGL.hpp
index fbf23fc..a2496a2 100644 (file)
--- a/src/OpenGL/libEGL/libEGL.hpp
+++ b/src/OpenGL/libEGL/libEGL.hpp
@@ -46,7 +46,6 @@ public:
        EGLBoolean (*eglCopyBuffers)(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
        EGLImageKHR (*eglCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
        EGLBoolean (*eglDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image);
-       EGLBoolean (*eglSwapBuffersWithDamageKHR)(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
        __eglMustCastToProperFunctionPointerType (*eglGetProcAddress)(const char*);
        EGLSyncKHR (*eglCreateSyncKHR)(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
        EGLBoolean (*eglDestroySyncKHR)(EGLDisplay dpy, EGLSyncKHR sync);

diff --git a/src/OpenGL/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
index 117e5fc..c0690e7 100644 (file)
--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -356,7 +356,6 @@ EGLBoolean SwapBuffers(EGLDisplay dpy, EGLSurface surface);
 EGLBoolean CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);\r
 EGLImageKHR CreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);\r
 EGLBoolean DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image);\r
-EGLBoolean SwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);\r
 EGLDisplay GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list);\r
 EGLSurface CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);\r
 EGLSurface CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list);\r
@@ -544,11 +543,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR ima
        return egl::DestroyImageKHR(dpy, image);\r
 }\r
 \r
-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects)\r
-{\r
-       return egl::SwapBuffersWithDamageKHR(dpy, surface, rects, n_rects);\r
-}\r
-\r
 EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)\r
 {\r
        return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list);\r
@@ -627,7 +621,6 @@ LibEGLexports::LibEGLexports()
        this->eglCopyBuffers = egl::CopyBuffers;\r
        this->eglCreateImageKHR = egl::CreateImageKHR;\r
        this->eglDestroyImageKHR = egl::DestroyImageKHR;\r
-       this->eglSwapBuffersWithDamageKHR = egl::SwapBuffersWithDamageKHR;\r
        this->eglGetProcAddress = egl::GetProcAddress;\r
        this->eglCreateSyncKHR = egl::CreateSyncKHR;\r
        this->eglDestroySyncKHR = egl::DestroySyncKHR;\r

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.def b/src/OpenGL/libGLES_CM/libGLES_CM.def
index 8d11790..cf15c8b 100644 (file)
--- a/src/OpenGL/libGLES_CM/libGLES_CM.def
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.def
@@ -208,7 +208,6 @@ EXPORTS
     eglDestroySyncKHR
     eglClientWaitSyncKHR
     eglGetSyncAttribKHR
-       eglSwapBuffersWithDamageKHR
 
        libGLES_CM_swiftshader
 

diff --git a/src/OpenGL/libGLES_CM/main.cpp b/src/OpenGL/libGLES_CM/main.cpp
index 821ba89..38a50aa 100644 (file)
--- a/src/OpenGL/libGLES_CM/main.cpp
+++ b/src/OpenGL/libGLES_CM/main.cpp
@@ -541,11 +541,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR syn
        return libEGL->eglGetSyncAttribKHR(dpy, sync, attribute, value);\r
 }\r
 \r
-EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects)\r
-{\r
-       return libEGL->eglSwapBuffersWithDamageKHR(dpy, surface, rects, n_rects);\r
-}\r
-\r
 GL_API void GL_APIENTRY glActiveTexture(GLenum texture)\r
 {\r
        return es1::ActiveTexture(texture);\r