cleanup EGL a bit. remove unused extension. (10cab190) · Commits · e / os / android_frameworks_native

opengl/include/EGL/eglext.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -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

opengl/libagl/egl.cpp

+0 −28

Original line number	Diff line number	Diff line
		@@ -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();
		}

opengl/libs/EGL/egl.cpp

+0 −19

Original line number	Diff line number	Diff line
		@@ -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);
		}