From cf3acfe4acc2443dc0d7bb7577291b47cddcca5a Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Sun, 25 Mar 2012 17:13:14 +0000 Subject: [PATCH] EGL: implement fgPlatformGetProcAddress git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1214 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 2 ++ src/egl/fg_ext_egl.c | 32 ++++++++++++++++++++++++++++++++ src/x11/fg_ext_x11.c | 3 ++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/egl/fg_ext_egl.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 19e6743..33b2b93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ ELSEIF(ANDROID) LIST(APPEND FREEGLUT_SRCS src/egl/fg_internal_egl.h src/egl/fg_display_egl.c + src/egl/fg_ext_egl.c src/egl/fg_init_egl.c src/egl/fg_state_egl.c src/egl/fg_structure_egl.c @@ -145,6 +146,7 @@ ELSE() LIST(APPEND FREEGLUT_SRCS src/egl/fg_internal_egl.h src/egl/fg_display_egl.c + src/egl/fg_ext_egl.c src/egl/fg_init_egl.c src/egl/fg_state_egl.c src/egl/fg_structure_egl.c diff --git a/src/egl/fg_ext_egl.c b/src/egl/fg_ext_egl.c new file mode 100644 index 0000000..c5dfc2b --- /dev/null +++ b/src/egl/fg_ext_egl.c @@ -0,0 +1,32 @@ +/* + * fg_ext_egl.c + * + * Functions related to OpenGL extensions. + * + * Copyright (c) 2012 Sylvain Beucler + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include "../fg_internal.h" + +SFG_Proc fgPlatformGetProcAddress( const char *procName ) +{ + return (SFG_Proc)eglGetProcAddress( ( const GLubyte * )procName ); +} diff --git a/src/x11/fg_ext_x11.c b/src/x11/fg_ext_x11.c index d243cfd..925c0d5 100644 --- a/src/x11/fg_ext_x11.c +++ b/src/x11/fg_ext_x11.c @@ -49,6 +49,7 @@ GLUTproc fgPlatformGetGLUTProcAddress( const char* procName ) } +#ifndef EGL_VERSION_1_0 SFG_Proc fgPlatformGetProcAddress( const char *procName ) { #if defined( GLX_ARB_get_proc_address ) @@ -57,4 +58,4 @@ SFG_Proc fgPlatformGetProcAddress( const char *procName ) return NULL; #endif } - +#endif -- 1.7.10.4