diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-05-07 22:30:43 +0100 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-09 18:33:27 -0700 |
| commit | fbc15d34c368f6e1bd78c1ecd5e0d318cd6fdea3 (patch) | |
| tree | 13ae879e9b6d6021a9428534ad2b428b76507458 | |
| parent | f6b31ce57d78d5988a4ff42817ad1819b699b38f (diff) | |
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@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78403
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
(cherry picked from commit 326b8e253e5ee2e09e54ad46d8370a6e8c8d46da)
| -rw-r--r-- | src/glx/tests/query_renderer_implementation_unittest.cpp | 6 |
1 files 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 6ec4c4f8030..7f8f3018640 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() |