[meego-commits] 15411: Changes to Trunk:Testing/mesa

[Li Peng]

Hi,
I have made the following changes to mesa in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Li Peng

[This message was auto-generated]

---

Request #15411:

  submit:   devel:x11:Trunk/mesa(r135) -> Trunk:Testing/mesa


Message:
    Fix a typo of EGL software driver (forwarded request 15406 from hfeng1)

State:   new          2011-03-28T23:42:57 pli1
Comment: None



changes files:
--------------
--- mesa.changes
+++ mesa.changes
@@ -0,0 +1,3 @@
+* Tue Mar 29 2011 Feng Haitao <haitao.feng at intel.com> - 7.9.1
+- Fix a typo in EGL software driver. BMC #14979
+

spec files:
-----------

other changes:
--------------

++++++ egl-dri2-swrast-2.patch
--- egl-dri2-swrast-2.patch
+++ egl-dri2-swrast-2.patch
@@ -1,6 +1,6 @@
 diff -urN orig/src/egl/drivers/dri2/egl_dri2.c modified/src/egl/drivers/dri2/egl_dri2.c
 --- orig/src/egl/drivers/dri2/egl_dri2.c	2011-03-25 01:24:38.974985020 -0700
-+++ modified/src/egl/drivers/dri2/egl_dri2.c	2011-03-25 01:25:04.250984930 -0700
++++ modified/src/egl/drivers/dri2/egl_dri2.c	2011-03-28 22:18:43.550263781 -0700
 @@ -939,7 +939,7 @@
     if (api_mask & (1 << __DRI_API_GLES2))
        disp->ClientAPIsMask |= EGL_OPENGL_ES2_BIT;
@@ -18,3 +18,12 @@
     disp->DriverData = (void *) dri2_dpy;
     dri2_dpy->fd = (int) disp->PlatformDisplay;
  
+@@ -1502,7 +1503,7 @@
+    if (dri2_dpy->x11_dri2_accel) {
+       xcb_dri2_create_drawable (dri2_dpy->conn, dri2_surf->drawable);
+    } else {
+-      swrastCreateSurface(dri2_surf, dri2_dpy, _eglGetConfigKey(conf, EGL_DEPTH_SIZE));
++      swrastCreateSurface(dri2_surf, dri2_dpy, _eglGetConfigKey(conf, EGL_BUFFER_SIZE));
+    }
+ 
+    if (type != EGL_PBUFFER_BIT) {