diff options
| author | Zhai Edwin <edwin.zhai@intel.com> | 2011-05-10 14:02:35 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-11 16:48:21 +0100 |
| commit | a2e232e2313ee267076bb8de32a1a604dbebc33b (patch) | |
| tree | 0bd71628aa88c9975d1fe031609558e26ca9164b /meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch | |
| parent | 7f7de31e9caa1594f2175f90f8faa96a88627329 (diff) | |
| download | poky-a2e232e2313ee267076bb8de32a1a604dbebc33b.tar.gz | |
qemu: Upgrade qemu git to the latest 0.14 branch
Also add missing patch to build qemu-git
[YOCTO #1013] got fixed
(From OE-Core rev: 9b80846152931bed018f33baaaf1ba253e756867)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch new file mode 100644 index 0000000000..478b204274 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | Allow releasing the GLXContext/Drawable with glXMakeCurrent. | ||
| 2 | |||
| 3 | --- | ||
| 4 | commit d942ed4e853e08d2298f3e11e9a952c1d952bff5 | ||
| 5 | tree f0a934efd8a8ff48e2d96f0d6fc7d70bef106bfe | ||
| 6 | parent 93619e6be184f8de08759d347825ee0d678a6f9c | ||
| 7 | author Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:22:05 +0200 | ||
| 8 | committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:22:05 +0200 | ||
| 9 | |||
| 10 | target-i386/opengl_exec.c | 31 ++++++++++++++++--------------- | ||
| 11 | 1 files changed, 16 insertions(+), 15 deletions(-) | ||
| 12 | |||
| 13 | Index: qemu-0.14.0/target-i386/opengl_exec.c | ||
| 14 | =================================================================== | ||
| 15 | --- qemu-0.14.0.orig/target-i386/opengl_exec.c | ||
| 16 | +++ qemu-0.14.0/target-i386/opengl_exec.c | ||
| 17 | @@ -1600,10 +1600,9 @@ int do_function_call(int func_number, ar | ||
| 18 | fprintf(stderr, "client_drawable=%p fake_ctx=%d\n", | ||
| 19 | (void *) client_drawable, fake_ctxt); | ||
| 20 | |||
| 21 | - if (client_drawable == 0 && fake_ctxt == 0) { | ||
| 22 | + if (client_drawable == 0 && fake_ctxt == 0) | ||
| 23 | ret_int = glXMakeCurrent(dpy, 0, NULL); | ||
| 24 | - process->current_state = &process->default_state; | ||
| 25 | - } else if ((drawable = (GLXDrawable) | ||
| 26 | + else if ((drawable = (GLXDrawable) | ||
| 27 | get_association_fakepbuffer_pbuffer( | ||
| 28 | process, client_drawable))) { | ||
| 29 | GLXContext ctxt = get_association_fakecontext_glxcontext( | ||
| 30 | @@ -1651,19 +1650,21 @@ int do_function_call(int func_number, ar | ||
| 31 | } | ||
| 32 | |||
| 33 | if (ret_int) { | ||
| 34 | - for (i = 0; i < process->nb_states; i ++) { | ||
| 35 | - if (process->glstates[i]->fake_ctxt == fake_ctxt) { | ||
| 36 | - /* HACK !!! REMOVE */ | ||
| 37 | - process->current_state = process->glstates[i]; | ||
| 38 | - process->current_state->drawable = drawable; | ||
| 39 | - break; | ||
| 40 | - } | ||
| 41 | - } | ||
| 42 | + if (fake_ctxt) { | ||
| 43 | + for (i = 0; i < process->nb_states; i ++) | ||
| 44 | + if (process->glstates[i]->fake_ctxt == fake_ctxt) { | ||
| 45 | + /* HACK !!! REMOVE */ | ||
| 46 | + process->current_state = process->glstates[i]; | ||
| 47 | + process->current_state->drawable = drawable; | ||
| 48 | + break; | ||
| 49 | + } | ||
| 50 | |||
| 51 | - if (i == process->nb_states) { | ||
| 52 | - fprintf(stderr, "error remembering the new context\n"); | ||
| 53 | - exit(-1); | ||
| 54 | - } | ||
| 55 | + if (i == process->nb_states) { | ||
| 56 | + fprintf(stderr, "error remembering the new context\n"); | ||
| 57 | + exit(-1); | ||
| 58 | + } | ||
| 59 | + } else | ||
| 60 | + process->current_state = &process->default_state; | ||
| 61 | } | ||
| 62 | break; | ||
| 63 | } | ||
