← Back to branch summary

~gma500/emgd/trunk

« back to all changes in this revision

Viewing changes to xorg/xorg-server-1.7.6/debian/patches/196_xvfb-fbscreeninit-handling.patch

  • Committer: José Bernardo Bandos
  • Date: 2010-08-28 16:04:10 UTC
  • Revision ID: jbs@jbs-laptop-20100828160410-nw5zohdn37oupdv2
First step to add emgd drivers from meego

Show diffs side-by-side

added added

removed removed

Lines of Context:
xorg/xorg-server-1.7.6/debian/patches/196_xvfb-fbscreeninit-handling.patch
1
 
=== modified file 'hw/vfb/InitOutput.c'
2
 
--- a/hw/vfb/InitOutput.c       2009-06-11 20:34:06 +0000
3
 
+++ b/hw/vfb/InitOutput.c       2010-02-02 16:34:02 +0000
4
 
@@ -66,6 +66,7 @@
5
 
 #endif /* HAS_SHM */
6
 
 #include "dix.h"
7
 
 #include "miline.h"
8
 
+#include "randrstr.h"
9
 
 
10
 
 #define VFB_DEFAULT_WIDTH      1280
11
 
 #define VFB_DEFAULT_HEIGHT     1024
12
 
@@ -904,13 +905,13 @@
13
 
 
14
 
     ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
15
 
                       dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
16
 
+    if (!ret) return FALSE;
17
 
+
18
 
 #ifdef RENDER
19
 
-    if (ret && Render) 
20
 
+    if (Render) 
21
 
        fbPictureInit (pScreen, 0, 0);
22
 
 #endif
23
 
 
24
 
-    if (!ret) return FALSE;
25
 
-
26
 
     miInitializeBackingStore(pScreen);
27
 
 
28
 
     /*
29