From: Brian Paul Date: Sat, 17 Dec 2005 05:37:15 +0000 (+0000) Subject: minor code movement X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9b4acfeb8044bfe3f9275cb51fed9ccd3651d95;p=mesa.git minor code movement --- diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c index a17968e7ff2..83abd0a3705 100644 --- a/src/egl/main/eglglobals.c +++ b/src/egl/main/eglglobals.c @@ -113,17 +113,3 @@ _eglError(EGLint errCode, const char *msg) fprintf(stderr, "EGL user error 0x%x (%s) in %s\n", errCode, s, msg); } } - - - -/** - * Return a new screen handle/ID. - * NOTE: we never reuse these! - */ -EGLScreenMESA -_eglAllocScreenHandle(void) -{ - EGLScreenMESA s = _eglGlobal.FreeScreenHandle; - _eglGlobal.FreeScreenHandle++; - return s; -} diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h index 44b4626c583..c25ab3e35b5 100644 --- a/src/egl/main/eglglobals.h +++ b/src/egl/main/eglglobals.h @@ -52,8 +52,4 @@ extern void _eglError(EGLint errCode, const char *msg); -extern EGLScreenMESA -_eglAllocScreenHandle(void); - - #endif /* EGLGLOBALS_INCLUDED */ diff --git a/src/egl/main/eglscreen.c b/src/egl/main/eglscreen.c index d8ec5b5f733..9c9a8377bf2 100644 --- a/src/egl/main/eglscreen.c +++ b/src/egl/main/eglscreen.c @@ -23,6 +23,19 @@ #include "eglscreen.h" +/** + * Return a new screen handle/ID. + * NOTE: we never reuse these! + */ +EGLScreenMESA +_eglAllocScreenHandle(void) +{ + EGLScreenMESA s = _eglGlobal.FreeScreenHandle; + _eglGlobal.FreeScreenHandle++; + return s; +} + + /** * Initialize an _EGLScreen object to default values. */ diff --git a/src/egl/main/eglscreen.h b/src/egl/main/eglscreen.h index 5d1cff9284a..833439b4107 100644 --- a/src/egl/main/eglscreen.h +++ b/src/egl/main/eglscreen.h @@ -2,11 +2,6 @@ #define EGLSCREEN_INCLUDED -/* NOTE: there is no public EGLScreen type, we refers to screens with - * an integer. - */ - - /** * Per-screen information. * Note that an EGL screen doesn't have a size. A screen may be set to @@ -31,6 +26,10 @@ struct _egl_screen }; +extern EGLScreenMESA +_eglAllocScreenHandle(void); + + extern void _eglInitScreen(_EGLScreen *screen);