summaryrefslogtreecommitdiff
path: root/src/egl/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-12-17 05:37:15 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-12-17 05:37:15 +0000
commitc9b4acfeb8044bfe3f9275cb51fed9ccd3651d95 (patch)
treea21dd494062479ea4bcf9a4dd92f23069719794a /src/egl/main
parent782291ab916dcb3f11fe8b7c934b1fd164c46020 (diff)
minor code movement
Diffstat (limited to 'src/egl/main')
-rw-r--r--src/egl/main/eglglobals.c14
-rw-r--r--src/egl/main/eglglobals.h4
-rw-r--r--src/egl/main/eglscreen.c13
-rw-r--r--src/egl/main/eglscreen.h9
4 files changed, 17 insertions, 23 deletions
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index a17968e7ff..83abd0a370 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 44b4626c58..c25ab3e35b 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 d8ec5b5f73..9c9a8377bf 100644
--- a/src/egl/main/eglscreen.c
+++ b/src/egl/main/eglscreen.c
@@ -24,6 +24,19 @@
/**
+ * 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.
*/
void
diff --git a/src/egl/main/eglscreen.h b/src/egl/main/eglscreen.h
index 5d1cff9284..833439b410 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);