commit f41412b0a4d1c315125e6ac2ed5a128af3e7229a
author Nicolas Capens <capn@google.com> Sat Dec 06 05:29:54 2014 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Dec 10 19:25:32 2014 +0000
tree 6a95a9f1488afbf7bc00291fe7841c6055582a63
parent 8d869e025da7ac96ef309407f5c36faf9054961f

Fall back to the default visual if no X8R8G8B8.

Bug 18510357

Change-Id: I2406106482b8c65408df783ebb78f5abd17a6320
Reviewed-on: https://swiftshader-review.googlesource.com/1593
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/Main/FrameBufferX11.cpp

diff --git a/src/Main/FrameBufferX11.cpp b/src/Main/FrameBufferX11.cpp
index 948c26b..7fb97e4 100644
--- a/src/Main/FrameBufferX11.cpp
+++ b/src/Main/FrameBufferX11.cpp
@@ -51,8 +51,8 @@
 		int depth = XDefaultDepth(x_display, screen);
 
 		Status status = XMatchVisualInfo(x_display, screen, 32, TrueColor, &x_visual);
-		assert(status != 0 && x_visual.blue_mask == 0xFF);   // Only X8R8G8B8 implemented
-		Visual *visual = x_visual.visual;

+		bool match = (status != 0 && x_visual.blue_mask == 0xFF);   // Prefer X8R8G8B8
+		Visual *visual = match ? x_visual.visual : XDefaultVisual(x_display, screen);

 

 		mit_shm = (XShmQueryExtension(x_display) == True);