Mesa (10.2): glx/tests: Partially revert commit 51e3569573a7b3f8da0df093836761003fcdc414

Ian Romanick idr at kemper.freedesktop.org
Sat May 10 03:27:28 UTC 2014


Module: Mesa
Branch: 10.2
Commit: f2682b3b9f21006937c29549a127b817e5c718c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2682b3b9f21006937c29549a127b817e5c718c5

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Wed May  7 22:30:43 2014 +0100

glx/tests: Partially revert commit 51e3569573a7b3f8da0df093836761003fcdc414

C++ does not support designated initializers, thus compilation
is not guaranteed to succeed. Surprisingly gcc 4.6.3 fails to
build the code, while version 4.9.0 compiles it without a hitch.

Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78403
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Tested-by: Vinson Lee <vlee at freedesktop.org>
(cherry picked from commit 326b8e253e5ee2e09e54ad46d8370a6e8c8d46da)

---

 src/glx/tests/query_renderer_implementation_unittest.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index 6ec4c4f..7f8f301 100644
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -141,10 +141,10 @@ fake_queryString(__DRIscreen *screen, int attribute, const char **val)
 }
 
 static const __DRI2rendererQueryExtension rendererQueryExt = {
-   .base = { __DRI2_RENDERER_QUERY, 1 },
+   { __DRI2_RENDERER_QUERY, 1 },
 
-   .queryInteger = fake_queryInteger,
-   .queryString = fake_queryString
+   fake_queryInteger,
+   fake_queryString
 };
 
 void dri2_query_renderer_string_test::SetUp()




More information about the mesa-commit mailing list