equal
deleted
inserted
replaced
1 --- src/i830_dri.h Tue May 22 10:57:01 2007 |
1 diff -urp -x '*~' -x '*.orig' src/i830_common.h src/i830_common.h |
2 +++ src/i830_dri.h Tue May 22 10:57:57 2007 |
2 --- src/i830_common.h 2008-07-22 23:14:09.000000000 -0700 |
3 @@ -22,16 +22,20 @@ |
3 +++ src/i830_common.h 2009-01-10 20:01:43.664950000 -0800 |
|
4 @@ -94,6 +94,7 @@ typedef struct { |
|
5 int pf_current_page; /* which buffer is being displayed? */ |
|
6 int perf_boxes; /* performance boxes to be displayed */ |
|
7 int width, height; /* screen size in pixels */ |
|
8 + int pad0; |
|
9 |
|
10 drm_handle_t front_handle; |
|
11 int front_offset; |
|
12 diff -urp -x '*~' -x '*.orig' src/i830_dri.h src/i830_dri.h |
|
13 --- src/i830_dri.h 2008-08-25 18:25:53.000000000 -0700 |
|
14 +++ src/i830_dri.h 2009-01-10 20:01:43.652983000 -0800 |
|
15 @@ -22,16 +22,20 @@ typedef struct _I830DRIRec { |
4 drm_handle_t unused2; /* backbuffer */ |
16 drm_handle_t unused2; /* backbuffer */ |
5 |
17 |
6 drmSize unused3; /* depthbufferSize */ |
18 drmSize unused3; /* depthbufferSize */ |
7 + drmSize pad0; |
19 + drmSize pad0; |
8 drm_handle_t unused4; /* depthbuffer */ |
20 drm_handle_t unused4; /* depthbuffer */ |
20 drmSize unused10; /* agp_buf_size */ |
32 drmSize unused10; /* agp_buf_size */ |
21 + drmSize pad3; |
33 + drmSize pad3; |
22 |
34 |
23 int deviceID; |
35 int deviceID; |
24 int width; |
36 int width; |
25 --- src/i830_common.h Tue May 22 10:58:16 2007 |
37 diff -urp -x '*~' -x '*.orig' src/modes/xf86RandR12.c src/modes/xf86RandR12.c |
26 +++ src/i830_common.h Tue May 22 10:58:40 2007 |
38 --- src/modes/xf86RandR12.c 2008-04-13 18:57:30.000000000 -0700 |
27 @@ -92,6 +92,7 @@ |
39 +++ src/modes/xf86RandR12.c 2009-01-10 20:01:43.666024000 -0800 |
28 int pf_current_page; /* which buffer is being displayed? */ |
40 @@ -207,6 +207,11 @@ xf86RandR12SetMode (ScreenPtr pScree |
29 int perf_boxes; /* performance boxes to be displayed */ |
|
30 int width, height; /* screen size in pixels */ |
|
31 + int pad0; |
|
32 |
|
33 drm_handle_t front_handle; |
|
34 int front_offset; |
|
35 --- src/modes/xf86RandR12.c Tue May 22 10:59:52 2007 |
|
36 +++ src/modes/xf86RandR12.c Tue May 22 11:00:45 2007 |
|
37 @@ -207,6 +207,11 @@ |
|
38 /* Reset, just so we ensure the drivers SwitchMode is called */ |
41 /* Reset, just so we ensure the drivers SwitchMode is called */ |
39 scrp->currentMode = NULL; |
42 scrp->currentMode = NULL; |
40 } |
43 } |
41 +#if defined (__sun) |
44 +#if defined (__sun) |
42 + else { |
45 + else { |