diff options
author | Mathias Agopian <mathias@google.com> | 2010-08-27 13:15:50 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-08-27 13:17:32 -0700 |
commit | ebc3d5a5490c208ac1706b49263bd780999df724 (patch) | |
tree | b7744cf2bd77c9db2cfa70148f0466ea90d73cab /opengl | |
parent | 445ab76c49779998543bb78881f5d9f8ae81e598 (diff) | |
download | frameworks_base-ebc3d5a5490c208ac1706b49263bd780999df724.zip frameworks_base-ebc3d5a5490c208ac1706b49263bd780999df724.tar.gz frameworks_base-ebc3d5a5490c208ac1706b49263bd780999df724.tar.bz2 |
cleanup EGL a bit. remove unused extension.
Change-Id: Ia87120b076ab1bf7b28f06087878d8161fb46c88
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/include/EGL/eglext.h | 8 | ||||
-rw-r--r-- | opengl/libagl/egl.cpp | 28 | ||||
-rw-r--r-- | opengl/libs/EGL/egl.cpp | 19 |
3 files changed, 0 insertions, 55 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h index b121158..1ffcd56 100644 --- a/opengl/include/EGL/eglext.h +++ b/opengl/include/EGL/eglext.h @@ -229,14 +229,6 @@ struct android_native_buffer_t; #define EGL_NATIVE_BUFFER_ANDROID 0x3140 /* eglCreateImageKHR target */ #endif -#ifndef EGL_ANDROID_get_render_buffer -#define EGL_ANDROID_get_render_buffer 1 -#ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLClientBuffer EGLAPIENTRY eglGetRenderBufferANDROID(EGLDisplay dpy, EGLSurface draw); -#endif -typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETRENDERBUFFERANDROIDPROC) (EGLDisplay dpy, EGLSurface draw); -#endif - #ifndef EGL_ANDROID_swap_rectangle #define EGL_ANDROID_swap_rectangle 1 #ifdef EGL_EGLEXT_PROTOTYPES diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 9e25681..163b2db 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -158,7 +158,6 @@ struct egl_surface_t virtual EGLint getSwapBehavior() const; virtual EGLBoolean swapBuffers(); virtual EGLBoolean setSwapRectangle(EGLint l, EGLint t, EGLint w, EGLint h); - virtual EGLClientBuffer getRenderBuffer() const; protected: GGLSurface depth; }; @@ -202,9 +201,6 @@ EGLBoolean egl_surface_t::setSwapRectangle( { return EGL_FALSE; } -EGLClientBuffer egl_surface_t::getRenderBuffer() const { - return 0; -} // ---------------------------------------------------------------------------- @@ -230,7 +226,6 @@ struct egl_window_surface_v2_t : public egl_surface_t virtual EGLint getRefreshRate() const; virtual EGLint getSwapBehavior() const; virtual EGLBoolean setSwapRectangle(EGLint l, EGLint t, EGLint w, EGLint h); - virtual EGLClientBuffer getRenderBuffer() const; private: status_t lock(android_native_buffer_t* buf, int usage, void** vaddr); @@ -626,11 +621,6 @@ EGLBoolean egl_window_surface_v2_t::setSwapRectangle( return EGL_TRUE; } -EGLClientBuffer egl_window_surface_v2_t::getRenderBuffer() const -{ - return buffer; -} - EGLBoolean egl_window_surface_v2_t::bindDrawSurface(ogles_context_t* gl) { GGLSurface buffer; @@ -857,7 +847,6 @@ static char const * const gExtensionsString = // "KHR_image_pixmap " "EGL_ANDROID_image_native_buffer " "EGL_ANDROID_swap_rectangle " - "EGL_ANDROID_get_render_buffer " ; // ---------------------------------------------------------------------------- @@ -910,8 +899,6 @@ static const extention_map_t gExtentionMap[] = { (__eglMustCastToProperFunctionPointerType)&eglDestroyImageKHR }, { "eglSetSwapRectangleANDROID", (__eglMustCastToProperFunctionPointerType)&eglSetSwapRectangleANDROID }, - { "eglGetRenderBufferANDROID", - (__eglMustCastToProperFunctionPointerType)&eglGetRenderBufferANDROID }, }; /* @@ -2129,18 +2116,3 @@ EGLBoolean eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw, return EGL_TRUE; } - -EGLClientBuffer eglGetRenderBufferANDROID(EGLDisplay dpy, EGLSurface draw) -{ - if (egl_display_t::is_valid(dpy) == EGL_FALSE) - return setError(EGL_BAD_DISPLAY, (EGLClientBuffer)0); - - egl_surface_t* d = static_cast<egl_surface_t*>(draw); - if (!d->isValid()) - return setError(EGL_BAD_SURFACE, (EGLClientBuffer)0); - if (d->dpy != dpy) - return setError(EGL_BAD_DISPLAY, (EGLClientBuffer)0); - - // post the surface - return d->getRenderBuffer(); -} diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 94b60a1..5e61607 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -61,7 +61,6 @@ static char const * const gExtensionString = "EGL_KHR_image_pixmap " "EGL_ANDROID_image_native_buffer " "EGL_ANDROID_swap_rectangle " - "EGL_ANDROID_get_render_buffer " ; // ---------------------------------------------------------------------------- @@ -408,8 +407,6 @@ static const extention_map_t gExtentionMap[] = { (__eglMustCastToProperFunctionPointerType)&eglDestroyImageKHR }, { "eglSetSwapRectangleANDROID", (__eglMustCastToProperFunctionPointerType)&eglSetSwapRectangleANDROID }, - { "eglGetRenderBufferANDROID", - (__eglMustCastToProperFunctionPointerType)&eglGetRenderBufferANDROID }, }; extern const __eglMustCastToProperFunctionPointerType gExtensionForwarders[MAX_NUMBER_OF_GL_EXTENSIONS]; @@ -1810,19 +1807,3 @@ EGLBoolean eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw, } return setError(EGL_BAD_DISPLAY, NULL); } - -EGLClientBuffer eglGetRenderBufferANDROID(EGLDisplay dpy, EGLSurface draw) -{ - SurfaceRef _s(draw); - if (!_s.get()) return setError(EGL_BAD_SURFACE, (EGLClientBuffer*)0); - - if (!validate_display_surface(dpy, draw)) - return 0; - egl_display_t const * const dp = get_display(dpy); - egl_surface_t const * const s = get_surface(draw); - if (s->cnx->egl.eglGetRenderBufferANDROID) { - return s->cnx->egl.eglGetRenderBufferANDROID( - dp->disp[s->impl].dpy, s->surface); - } - return setError(EGL_BAD_DISPLAY, (EGLClientBuffer*)0); -} |