Don't set sample count

Author: TheMostDiligent

Tests/GPUTestFramework/src/Linux/TestingEnvironmentLinux.cpp

@@ -39,32 +39,44 @@ namespace Testing
 
 NativeWindow GPUTestingEnvironment::CreateNativeWindow()
 {
-        LOG_INFO_MESSAGE("XOpenDisplay");
-        auto* display = XOpenDisplay(0);
-        LOG_INFO_MESSAGE("XOpenDisplay completed");
+    LOG_INFO_MESSAGE("XOpenDisplay");
+    auto* display = XOpenDisplay(0);
+    LOG_INFO_MESSAGE("XOpenDisplay completed");
 
+    //GLXFBConfig* fbc = nullptr;
+    {
+        LOG_INFO_MESSAGE("Getting available GLXFBConfigs");
+        int          fbcount = 0;
+        GLXFBConfig* fbcs    = glXGetFBConfigs(display, DefaultScreen(display), &fbcount);
+        if (fbcount > 0)
+            LOG_INFO_MESSAGE("Available framebuffer configs: ", fbcount);
+        else
+            LOG_ERROR_MESSAGE("No framebuffer configs found");
+
+        for (int i = 0; i < fbcount; i++)
         {
-            LOG_INFO_MESSAGE("Getting available GLXFBConfigs");
-            int fbcount = 0;
-            GLXFBConfig* fbcs = glXGetFBConfigs(display, DefaultScreen(display), &fbcount);
-            if (fbcount > 0)
-                LOG_INFO_MESSAGE("Available framebuffer configs: ", fbcount);
-            else
-                LOG_ERROR_MESSAGE("No framebuffer configs found");
-
-            for (int i = 0; i < fbcount; i++) {
-                int red, green, blue, alpha, depth;
-                glXGetFBConfigAttrib(display, fbcs[i], GLX_RED_SIZE, &red);
-                glXGetFBConfigAttrib(display, fbcs[i], GLX_GREEN_SIZE, &green);
-                glXGetFBConfigAttrib(display, fbcs[i], GLX_BLUE_SIZE, &blue);
-                glXGetFBConfigAttrib(display, fbcs[i], GLX_ALPHA_SIZE, &alpha);
-                glXGetFBConfigAttrib(display, fbcs[i], GLX_DEPTH_SIZE, &depth);
-
-                LOG_INFO_MESSAGE("FBConfig ", i, ": R", red, " G", green, " B", blue, " A", alpha, " Depth", depth);
-            }
+            int red, green, blue, alpha, depth, samples, render_type, double_buffer, drawable_type;
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_RED_SIZE, &red);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_GREEN_SIZE, &green);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_BLUE_SIZE, &blue);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_ALPHA_SIZE, &alpha);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_DEPTH_SIZE, &depth);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_SAMPLES, &samples);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_RENDER_TYPE, &render_type);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_DOUBLEBUFFER, &double_buffer);
+            glXGetFBConfigAttrib(display, fbcs[i], GLX_DRAWABLE_TYPE, &drawable_type);
+
+            LOG_INFO_MESSAGE("FBConfig ", i, ": R", red, "G", green, "B", blue, "A", alpha, " D", depth, " S", samples,
+             " T ", render_type, " DB ", double_buffer, " DT ", drawable_type);
+
+            //if (fbc == nullptr && red == 8 && depth == 24 && render_type == GLX_RGBA_BIT && double_buffer != 0)
+            //    fbc = &fbcs[i];
         }
 
-        // clang-format off
+        XFree(fbcs);
+    }
+
+    // clang-format off
         static int visual_attribs[] =
         {
             GLX_RENDER_TYPE,    GLX_RGBA_BIT,
@@ -80,22 +92,22 @@ NativeWindow GPUTestingEnvironment::CreateNativeWindow()
             GLX_ALPHA_SIZE,     8,
 
             // The largest available depth buffer of at least GLX_DEPTH_SIZE size is preferred
-            GLX_DEPTH_SIZE,     32,
+            GLX_DEPTH_SIZE,     24,
 
             //GLX_SAMPLE_BUFFERS, 1,
-            GLX_SAMPLES, 1,
+            //GLX_SAMPLES, 1,
             None
         };
-        // clang-format on
+    // clang-format on
 
-        int fbcount = 0;
-        LOG_INFO_MESSAGE("glXChooseFBConfig");
-        GLXFBConfig* fbc = glXChooseFBConfig(display, DefaultScreen(display), visual_attribs, &fbcount);
-        LOG_INFO_MESSAGE("glXChooseFBConfig completed");
-        if (!fbc)
-        {
-            LOG_ERROR_AND_THROW("Failed to retrieve a framebuffer config");
-        }
+    int fbcount = 0;
+    LOG_INFO_MESSAGE("glXChooseFBConfig");
+    GLXFBConfig* fbc = glXChooseFBConfig(display, DefaultScreen(display), visual_attribs, &fbcount);
+    LOG_INFO_MESSAGE("glXChooseFBConfig completed");
+    if (!fbc)
+    {
+        LOG_ERROR_AND_THROW("Failed to retrieve a framebuffer config");
+    }
 
     LOG_INFO_MESSAGE("glXGetVisualFromFBConfig");
     XVisualInfo* vi = glXGetVisualFromFBConfig(display, fbc[0]);
@@ -186,7 +198,7 @@ NativeWindow GPUTestingEnvironment::CreateNativeWindow()
     {
         LOG_ERROR_AND_THROW("Failed to create GL context.");
     }
-    XFree(fbc);
+    //XFree(fbc);
 
     LOG_INFO_MESSAGE("glXMakeCurrent");
     glXMakeCurrent(display, win, ctx);

Tests/TestFramework/src/TestingEnvironment.cpp

@@ -58,14 +58,14 @@ void TestingEnvironment::MessageCallback(DEBUG_MESSAGE_SEVERITY Severity,
                                          const char*            File,
                                          int                    Line)
 {
-    if (!Message)
-        Message = "";
-    if (!Function)
-        Function = "";
-    if (!File)
-        File = "";
-
-    PlatformDebug::OutputDebugMessage(Severity, Message, Function, File, Line, TextColor::DarkRed);
+    // if (!Message)
+    //     Message = "";
+    // if (!Function)
+    //     Function = "";
+    // if (!File)
+    //     File = "";
+
+    // PlatformDebug::OutputDebugMessage(Severity, Message, Function, File, Line, TextColor::DarkRed);
 
     TextColor MsgColor = TextColor::Auto;
     if (Severity == DEBUG_MESSAGE_SEVERITY_ERROR || Severity == DEBUG_MESSAGE_SEVERITY_FATAL_ERROR)