Demos (master): egl/opengl: EGL_SURFACE_TYPE should be ORed.

[Chia-I Wu]

Module: Demos
Branch: master
Commit: 65fb19a0871d1112e42d62d7a52afe7bc2eebbb7
URL:    
http://cgit.freedesktop.org/mesa/demos/commit/?id=65fb19a0871d1112e42d62d7a52afe7bc2eebbb7

Author: Chia-I Wu <olva...@gmail.com>
Date:   Wed Dec 22 14:06:37 2010 +0800

egl/opengl: EGL_SURFACE_TYPE should be ORed.

It seems a window surface is always created.  Additional surface types
should be ORed.

---

 src/egl/opengl/xeglgears.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/egl/opengl/xeglgears.c b/src/egl/opengl/xeglgears.c
index a6a977d..2401d07 100644
--- a/src/egl/opengl/xeglgears.c
+++ b/src/egl/opengl/xeglgears.c
@@ -786,19 +786,19 @@ main(int argc, char *argv[])
       }
       else if (strcmp(argv[i], "-pixmap") == 0) {
          surface_type = GEARS_PIXMAP;
-        attribs[1] = EGL_PIXMAP_BIT;
+        attribs[1] |= EGL_PIXMAP_BIT;
       }
       else if (strcmp(argv[i], "-pixmap-texture") == 0) {
          surface_type = GEARS_PIXMAP_TEXTURE;
-        attribs[1] = EGL_PIXMAP_BIT;
+        attribs[1] |= EGL_PIXMAP_BIT;
       }
       else if (strcmp(argv[i], "-pbuffer") == 0) {
          surface_type = GEARS_PBUFFER;
-        attribs[1] = EGL_PBUFFER_BIT;
+        attribs[1] |= EGL_PBUFFER_BIT;
       }
       else if (strcmp(argv[i], "-pbuffer-texture") == 0) {
          surface_type = GEARS_PBUFFER_TEXTURE;
-        attribs[1] = EGL_PBUFFER_BIT;
+        attribs[1] |= EGL_PBUFFER_BIT;
       }
       else if (strcmp(argv[i], "-renderbuffer") == 0) {
          surface_type = GEARS_RENDERBUFFER;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit