commit 542cd096e3d34d219e65527328cad45a6bcb7ba9
author Jon Ashburn <jon@lunarg.com> Tue Jan 20 13:55:32 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:09 2015 -0700
tree 1c072869cc7e6319ead805af3ec31ecade15d582
parent 5567c814df1715b6d3aa4b02977ee5aebf4a12ed

memory alloc:  Remove memory_heap flags replace with memory_property flags

Conflicts:
	include/xgl.h
	tests/image_tests.cpp
	tests/init.cpp
	tests/xgltestbinding.h

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 2316b25..0441a9c 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -1162,6 +1162,8 @@
         if (it->format.channelFormat == XGL_CH_FMT_UNDEFINED ||
             (it->format.channelFormat >= XGL_CH_FMT_BC1 &&
              it->format.channelFormat <= XGL_CH_FMT_BC7) ||
+            it->format.channelFormat == XGL_CH_FMT_R64G64B64 ||
+            it->format.channelFormat == XGL_CH_FMT_R64G64B64A64 ||
             it->format.numericFormat == XGL_NUM_FMT_DS)
             continue;