Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits:
-
a3b3a4bb
by Timo Aaltonen at 2020-01-08T11:05:02+02:00
-
6d91b040
by Timo Aaltonen at 2020-01-08T11:38:20+02:00
-
2016362d
by Timo Aaltonen at 2020-01-08T11:39:13+02:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/drisw-fix-depth-for-ximage.diff
- debian/patches/series
Changes:
| 1 |
-mesa (19.3.1-4) UNRELEASED; urgency=medium
|
|
| 1 |
+mesa (19.3.1-4) unstable; urgency=medium
|
|
| 2 | 2 |
|
| 3 |
+ [ Julien Cristau ]
|
|
| 3 | 4 |
* Ensure strict dependencies on libglapi-mesa (closes: #947813).
|
| 4 | 5 |
|
| 5 |
- -- Julien Cristau <jcristau@debian.org> Fri, 03 Jan 2020 17:13:00 +0100
|
|
| 6 |
+ [ Timo Aaltonen ]
|
|
| 7 |
+ * control: Add libgl{,x}-dev to mesa-common-dev Depends. (Closes:
|
|
| 8 |
+ #947392)
|
|
| 9 |
+ * drisw-fix-depth-for-ximage.diff: Fix sw driver rgbBits/depth calculation.
|
|
| 10 |
+ (Closes: #947196)
|
|
| 11 |
+ |
|
| 12 |
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 08 Jan 2020 11:38:56 +0200
|
|
| 6 | 13 |
|
| 7 | 14 |
mesa (19.3.1-3) unstable; urgency=medium
|
| 8 | 15 |
|
| ... | ... | @@ -301,6 +301,8 @@ Package: mesa-common-dev |
| 301 | 301 |
Section: libdevel
|
| 302 | 302 |
Architecture: any
|
| 303 | 303 |
Depends:
|
| 304 |
+ libgl-dev,
|
|
| 305 |
+ libglx-dev,
|
|
| 304 | 306 |
libx11-dev,
|
| 305 | 307 |
libdrm-dev (>= 2.4.95) [!hurd-any],
|
| 306 | 308 |
${misc:Depends},
|
| 1 |
+diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
|
| 2 |
+index 3bf15322ff85e1397aa3174a308a870c50ec4756..61e11c3dbc4317fff0484b6cd9e0110765246a25 100644
|
|
| 3 |
+--- a/src/glx/drisw_glx.c
|
|
| 4 |
++++ b/src/glx/drisw_glx.c
|
|
| 5 |
+@@ -53,6 +53,28 @@ handle_xerror(Display *dpy, XErrorEvent *event)
|
|
| 6 |
+ static Bool
|
|
| 7 |
+ XCreateDrawable(struct drisw_drawable * pdp, int shmid, Display * dpy)
|
|
| 8 |
+ {
|
|
| 9 |
++ int depth = 0;
|
|
| 10 |
++
|
|
| 11 |
++ /* Use the visual depth, if this fbconfig corresponds to a visual */
|
|
| 12 |
++ if (pdp->config->visualID != 0) {
|
|
| 13 |
++ int matches = 0;
|
|
| 14 |
++ XVisualInfo *visinfo, template;
|
|
| 15 |
++
|
|
| 16 |
++ template.visualid = pdp->config->visualID;
|
|
| 17 |
++ template.screen = pdp->config->screen;
|
|
| 18 |
++ visinfo = XGetVisualInfo(dpy, VisualIDMask | VisualScreenMask,
|
|
| 19 |
++ &template, &matches);
|
|
| 20 |
++
|
|
| 21 |
++ if (visinfo && matches) {
|
|
| 22 |
++ depth = visinfo->depth;
|
|
| 23 |
++ XFree(visinfo);
|
|
| 24 |
++ }
|
|
| 25 |
++ }
|
|
| 26 |
++
|
|
| 27 |
++ /* Otherwise, or if XGetVisualInfo failed, use rgb(not a) size */
|
|
| 28 |
++ if (depth == 0)
|
|
| 29 |
++ depth = pdp->config->rgbBits - pdp->config->alphaBits;
|
|
| 30 |
++
|
|
| 31 |
+ if (pdp->ximage) {
|
|
| 32 |
+ XDestroyImage(pdp->ximage);
|
|
| 33 |
+ pdp->ximage = NULL;
|
|
| 34 |
+@@ -64,7 +86,7 @@ XCreateDrawable(struct drisw_drawable * pdp, int shmid, Display * dpy)
|
|
| 35 |
+ pdp->shminfo.shmid = shmid;
|
|
| 36 |
+ pdp->ximage = XShmCreateImage(dpy,
|
|
| 37 |
+ NULL,
|
|
| 38 |
+- pdp->config->rgbBits,
|
|
| 39 |
++ depth,
|
|
| 40 |
+ ZPixmap, /* format */
|
|
| 41 |
+ NULL, /* data */
|
|
| 42 |
+ &pdp->shminfo, /* shminfo */
|
|
| 43 |
+@@ -94,7 +116,7 @@ XCreateDrawable(struct drisw_drawable * pdp, int shmid, Display * dpy)
|
|
| 44 |
+ pdp->shminfo.shmid = -1;
|
|
| 45 |
+ pdp->ximage = XCreateImage(dpy,
|
|
| 46 |
+ NULL,
|
|
| 47 |
+- pdp->config->rgbBits,
|
|
| 48 |
++ depth,
|
|
| 49 |
+ ZPixmap, 0, /* format, offset */
|
|
| 50 |
+ NULL, /* data */
|
|
| 51 |
+ 0, 0, /* width, height */
|
| 1 | 1 |
07_gallium-fix-build-failure-on-powerpcspe.diff
|
| 2 |
+drisw-fix-depth-for-ximage.diff
|