diff options
| author | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-04 19:16:24 -0700 |
| commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
| tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /progs/egl | |
| parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
| parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'progs/egl')
| -rw-r--r-- | progs/egl/eglgears.c | 3 | ||||
| -rw-r--r-- | progs/egl/eglscreen.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c index 052d0f9e25d..2d9b8cac7f7 100644 --- a/progs/egl/eglgears.c +++ b/progs/egl/eglgears.c @@ -374,7 +374,8 @@ main(int argc, char *argv[]) EGLint screenAttribs[10]; EGLModeMESA mode[MAX_MODES]; EGLScreenMESA screen; - EGLint count, chosenMode; + EGLint count; + EGLint chosenMode = 0; GLboolean printInfo = GL_FALSE; EGLint width = 0, height = 0; diff --git a/progs/egl/eglscreen.c b/progs/egl/eglscreen.c index 47b3ce3366f..520f76ea036 100644 --- a/progs/egl/eglscreen.c +++ b/progs/egl/eglscreen.c @@ -52,7 +52,8 @@ main(int argc, char *argv[]) EGLint screenAttribs[10]; EGLModeMESA mode[MAX_MODES]; EGLScreenMESA screen; - EGLint count, chosenMode; + EGLint count; + EGLint chosenMode = 0; EGLint width = 0, height = 0; d = eglGetDisplay(EGL_DEFAULT_DISPLAY); |