diff options
| author | Chia-I Wu <[email protected]> | 2009-08-15 22:57:47 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-01-25 11:28:27 +0800 |
| commit | 95f8f75ad8bdb1d8e1cc16ea91fed8c407c36abd (patch) | |
| tree | 63c7619a1fc8c4e97851b73a25579355d9d1c11c /src | |
| parent | daea9270f877e3f32ef93f71ffa2d27dac4162b4 (diff) | |
egl: Update headers.
Update to the current versions found at
http://www.khronos.org/registry/egl/. There is one modification in
khrplatform.h for GCC visibility.
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/eglapi.c | 3 | ||||
| -rw-r--r-- | src/egl/main/eglconfig.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 26ed45c6fe5..e57ce211b84 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -678,7 +678,8 @@ eglGetError(void) } -void (* EGLAPIENTRY eglGetProcAddress(const char *procname))() +__eglMustCastToProperFunctionPointerType EGLAPIENTRY +eglGetProcAddress(const char *procname) { static const struct { const char *name; diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index 4d149603ae5..a57aa333529 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -224,7 +224,8 @@ static const struct { { EGL_MATCH_NATIVE_PIXMAP, ATTRIB_TYPE_PSEUDO, ATTRIB_CRITERION_SPECIAL, EGL_NONE }, - { EGL_PRESERVED_RESOURCES, ATTRIB_TYPE_PSEUDO, + /* there is a gap before EGL_SAMPLES */ + { 0x3030, ATTRIB_TYPE_PSEUDO, ATTRIB_CRITERION_IGNORE, 0 }, { EGL_NONE, ATTRIB_TYPE_PSEUDO, @@ -773,7 +774,7 @@ _eglIsConfigAttribValid(_EGLConfig *conf, EGLint attr) /* there are some holes in the range */ switch (attr) { - case EGL_PRESERVED_RESOURCES: + case 0x3030 /* a gap before EGL_SAMPLES */: case EGL_NONE: #ifdef EGL_VERSION_1_4 case EGL_MATCH_NATIVE_PIXMAP: |