misc:Fixes to get better behavior in release builds
authorTony Barbour <tony@LunarG.com>
Thu, 5 Feb 2015 21:14:33 +0000 (14:14 -0700)
committerTony Barbour <tony@LunarG.com>
Fri, 6 Feb 2015 16:52:47 +0000 (09:52 -0700)
Add -fno-strict-aliasing -fno-builtin-memcmp - Both of these are
used by the Mesa driver, and without the first one, we hang? in
link_shaders on release builds

Move cube's LoadTexture out of an assert so it isn't skipped in
release builds

CMakeLists.txt
demos/cube.c

index 4e11532..67ef772 100644 (file)
@@ -14,6 +14,7 @@ include(FindPkgConfig)
 
 if (CMAKE_COMPILER_IS_GNUCC)
     set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers")
+    set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ${COMMON_COMPILE_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILE_FLAGS}")
     if (UNIX)
index fdd300c..00951b5 100644 (file)
@@ -714,7 +714,8 @@ static void demo_prepare_textures(struct demo *demo)
             .borderColorType = XGL_BORDER_COLOR_OPAQUE_WHITE,
         };
 
-        assert(loadTexture(tex_files[i], NULL, NULL, &tex_width, &tex_height));
+        err = loadTexture(tex_files[i], NULL, NULL, &tex_width, &tex_height);
+        assert(err);
 
         const XGL_IMAGE_CREATE_INFO image = {
             .sType = XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO,