diff options
| author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
| commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
| tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/egl/main/egldriver.h | |
| parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
| parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/egl/main/egldriver.h')
| -rw-r--r-- | src/egl/main/egldriver.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h index 1a0aaad1f8c..651788cb7ae 100644 --- a/src/egl/main/egldriver.h +++ b/src/egl/main/egldriver.h @@ -64,6 +64,14 @@ struct _egl_driver }; +extern _EGLDriver * +_eglBuiltInDriverDRI2(const char *args); + + +extern _EGLDriver * +_eglBuiltInDriverGLX(const char *args); + + PUBLIC _EGLDriver * _eglMain(const char *args); |