diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-12 16:48:32 +0100 |
| commit | a3eb0f718e19653a2ad8e49396c904183be456f3 (patch) | |
| tree | 0092574c469ea586a6cab8b8ebb7ac62b8221a2a /progs/egl/eglscreen.c | |
| parent | 491f384c3958067e6c4c994041f5d8d413b806bc (diff) | |
| parent | 784cca9fa527de771754d76545970f78094b9adf (diff) | |
Merge branch 'master' into glsl-pp-rework-2
Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
Diffstat (limited to 'progs/egl/eglscreen.c')
| -rw-r--r-- | progs/egl/eglscreen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/egl/eglscreen.c b/progs/egl/eglscreen.c index c0b5a210a4..47b3ce3366 100644 --- a/progs/egl/eglscreen.c +++ b/progs/egl/eglscreen.c @@ -55,7 +55,7 @@ main(int argc, char *argv[]) EGLint count, chosenMode; EGLint width = 0, height = 0; - d = eglGetDisplay((EGLNativeDisplayType)"!EGL_i915"); + d = eglGetDisplay(EGL_DEFAULT_DISPLAY); assert(d); if (!eglInitialize(d, &maj, &min)) { |