glx/glvnd: Don't modify the dummy slot in the dispatch table

[mesa.git] / src / glx / tests / create_context_unittest.cpp

diff --git a/src/glx/tests/create_context_unittest.cpp b/src/glx/tests/create_context_unittest.cpp
index f97ec7ca5f2687b0886c0c2ff10dde9b6b208ee6..a2590589db2d8087cb584e686daa17a4c45d7f07 100644 (file)
--- a/src/glx/tests/create_context_unittest.cpp
+++ b/src/glx/tests/create_context_unittest.cpp
@@ -23,10 +23,8 @@
 #include <gtest/gtest.h>
 #include <string.h>
 
-extern "C" {
 #include "glxclient.h"
 #include "glx_error.h"
-}
 
 #include <xcb/glx.h>
 #include "mock_xdisplay.h"
@@ -54,11 +52,15 @@ glx_context_init(struct glx_context *gc,
    return GL_TRUE;
 }
 
+bool GetGLXScreenConfigs_called = false;
+
 extern "C" struct glx_screen *
 GetGLXScreenConfigs(Display * dpy, int scrn)
 {
    (void) dpy;
    (void) scrn;
+
+   GetGLXScreenConfigs_called = true;
    return psc;
 }
 
@@ -210,7 +212,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_context)
    glXCreateContextAttribsARB(this->dpy, (GLXFBConfig) &this->fbc, 0,
                              False, NULL);
 
-   EXPECT_EQ(99, req.context);
+   EXPECT_EQ(99u, req.context);
 }
 
 TEST_F(glXCreateContextAttribARB_test, sent_correct_fbconfig)
@@ -280,7 +282,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_screen)
    glXCreateContextAttribsARB(this->dpy, (GLXFBConfig) &this->fbc, 0,
                              False, NULL);
 
-   EXPECT_EQ(7, req.screen);
+   EXPECT_EQ(7u, req.screen);
 }
 
 TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs)
@@ -303,7 +305,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs)
    glXCreateContextAttribsARB(this->dpy, (GLXFBConfig) &this->fbc, 0,
                              False, attribs);
 
-   EXPECT_EQ(4, req.num_attribs);
+   EXPECT_EQ(4u, req.num_attribs);
 }
 
 TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs_empty_list)
@@ -315,7 +317,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs_empty_list)
    glXCreateContextAttribsARB(this->dpy, (GLXFBConfig) &this->fbc, 0,
                              False, attribs);
 
-   EXPECT_EQ(0, req.num_attribs);
+   EXPECT_EQ(0u, req.num_attribs);
 }
 
 TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs_NULL_list_pointer)
@@ -323,7 +325,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_num_attribs_NULL_list_pointe
    glXCreateContextAttribsARB(this->dpy, (GLXFBConfig) &this->fbc, 0,
                              False, NULL);
 
-   EXPECT_EQ(0, req.num_attribs);
+   EXPECT_EQ(0u, req.num_attribs);
 }
 
 TEST_F(glXCreateContextAttribARB_test, sent_correct_attrib_list)
@@ -339,7 +341,7 @@ TEST_F(glXCreateContextAttribARB_test, sent_correct_attrib_list)
                              False, attribs);
 
    for (unsigned i = 0; i < 6; i++) {
-      EXPECT_EQ(attribs[i], sent_attribs[i]);
+      EXPECT_EQ((uint32_t) attribs[i], sent_attribs[i]);
    }
 }
 /*@}*/
@@ -376,7 +378,7 @@ TEST_F(glXCreateContextAttribARB_test, correct_context_xid)
    ASSERT_NE((GLXContext)0, ctx);
 
    struct glx_context *glx_ctx = (struct glx_context *) ctx;
-   EXPECT_EQ(99, glx_ctx->xid);
+   EXPECT_EQ(99u, glx_ctx->xid);
 }
 
 TEST_F(glXCreateContextAttribARB_test, correct_context_share_xid)