← Back to branch summary

~openelec-developers/openelec/webbrowser-integration

« back to all changes in this revision

Viewing changes to packages/graphics/Mesa/patches/110_fix-libkms-api.diff

  • Committer: Stephan Raue
  • Date: 2010-04-01 12:21:02 UTC
  • mfrom: (2215.1.216 openelec)
  • Revision ID: stephan@x200t.openelec.tv-20100401122102-yszts90ngqfkupv5
merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
packages/graphics/Mesa/patches/110_fix-libkms-api.diff
1
 
From 8db8adfd01a1ff1e2a160ae3b0199bd3daa4191a Mon Sep 17 00:00:00 2001
2
 
From: Jakob Bornecrantz <jakob@vmware.com>
3
 
Date: Thu, 28 Jan 2010 16:59:26 +0000
4
 
Subject: st/xorg: Update to new libkms interface but be backwards compatible
5
 
 
6
 
---
7
 
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
8
 
index 0160b1a..daa9f8b 100644
9
 
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
10
 
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
11
 
@@ -243,7 +243,11 @@ crtc_load_cursor_argb_kms(xf86CrtcPtr crtc, CARD32 * image)
12
 
        unsigned attr[8];
13
 
 
14
 
        attr[0] = KMS_BO_TYPE;
15
 
+#ifdef KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8
16
 
+       attr[1] = KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8;
17
 
+#else
18
 
        attr[1] = KMS_BO_TYPE_CURSOR;
19
 
+#endif
20
 
        attr[2] = KMS_WIDTH;
21
 
        attr[3] = 64;
22
 
        attr[4] = KMS_HEIGHT;
23
 
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
24
 
index e4ad789..f53a879 100644
25
 
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
26
 
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
27
 
@@ -1008,7 +1008,11 @@ drv_create_front_buffer_kms(ScrnInfoPtr pScrn)
28
 
     int ret;
29
 
 
30
 
     attr[0] = KMS_BO_TYPE;
31
 
+#ifdef KMS_BO_TYPE_SCANOUT_X8R8G8B8
32
 
+    attr[1] = KMS_BO_TYPE_SCANOUT_X8R8G8B8;
33
 
+#else
34
 
     attr[1] = KMS_BO_TYPE_SCANOUT;
35
 
+#endif
36
 
     attr[2] = KMS_WIDTH;
37
 
     attr[3] = pScrn->virtualX;
38
 
     attr[4] = KMS_HEIGHT;
39
 
--
40
 
cgit v0.8.3-6-g21f6