From ef9c4e1361c6ffffc9d072d64a21abe9cef21d51 Mon Sep 17 00:00:00 2001 From: beuc Date: Sat, 17 Mar 2012 19:29:49 +0000 Subject: [PATCH] Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1187 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/android/fg_window_android.c | 2 +- freeglut/freeglut/src/egl/fg_state_egl.c | 4 ++-- freeglut/freeglut/src/egl/fg_window_egl.c | 2 +- freeglut/freeglut/src/egl/fg_window_egl.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/freeglut/freeglut/src/android/fg_window_android.c b/freeglut/freeglut/src/android/fg_window_android.c index 1b601ab..1b064cf 100644 --- a/freeglut/freeglut/src/android/fg_window_android.c +++ b/freeglut/freeglut/src/android/fg_window_android.c @@ -52,7 +52,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title, return; } - fghChooseConfigEGL(&window->Window.pContext.egl.Config); + fghChooseConfig(&window->Window.pContext.egl.Config); window->Window.Context = fghCreateNewContextEGL(window); /* Wait until window is available and OpenGL context is created */ diff --git a/freeglut/freeglut/src/egl/fg_state_egl.c b/freeglut/freeglut/src/egl/fg_state_egl.c index 79da6d1..f3b922a 100644 --- a/freeglut/freeglut/src/egl/fg_state_egl.c +++ b/freeglut/freeglut/src/egl/fg_state_egl.c @@ -76,9 +76,9 @@ int fghPlatformGlutGetEGL ( GLenum eWhat ) /* I do not know yet if there will be a fgChooseVisual() function for Win32 */ case GLUT_DISPLAY_MODE_POSSIBLE: { - /* We should not have to call fgPlatformChooseFBConfig again here. */ + /* We should not have to call fghChooseConfig again here. */ EGLConfig config; - return fghChooseConfigEGL(&config); + return fghChooseConfig(&config); } /* This is system-dependant */ diff --git a/freeglut/freeglut/src/egl/fg_window_egl.c b/freeglut/freeglut/src/egl/fg_window_egl.c index a60f952..d83a3ea 100644 --- a/freeglut/freeglut/src/egl/fg_window_egl.c +++ b/freeglut/freeglut/src/egl/fg_window_egl.c @@ -26,7 +26,7 @@ #include #include "fg_internal.h" -int fghChooseConfigEGL(EGLConfig* config) { +int fghChooseConfig(EGLConfig* config) { const EGLint attribs[] = { EGL_SURFACE_TYPE, EGL_WINDOW_BIT, #ifdef GL_ES_VERSION_2_0 diff --git a/freeglut/freeglut/src/egl/fg_window_egl.h b/freeglut/freeglut/src/egl/fg_window_egl.h index 035fe24..71dfd1a 100644 --- a/freeglut/freeglut/src/egl/fg_window_egl.h +++ b/freeglut/freeglut/src/egl/fg_window_egl.h @@ -26,7 +26,7 @@ #ifndef __FG_WINDOW_EGL_H__ #define __FG_WINDOW_EGL_H__ -extern int fghChooseConfigEGL(EGLConfig* config); +extern int fghChooseConfig(EGLConfig* config); extern void fghPlatformOpenWindowEGL( SFG_Window* window ); extern EGLConfig fghCreateNewContextEGL( SFG_Window* window ); extern void fghPlatformCloseWindowEGL( SFG_Window* window );