OSDN Git Service

test: allow default attribs param for create config
authorU. Artie Eoff <ullysses.a.eoff@intel.com>
Tue, 11 Oct 2016 19:21:45 +0000 (12:21 -0700)
committerXiang, Haihao <haihao.xiang@intel.com>
Mon, 31 Oct 2016 02:00:08 +0000 (10:00 +0800)
Driver does not require config attributes to create a config.
Thus, allow I965TestFixture::createConfig to be called without
specifying ConfigAttribs.

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
Reviewed-by: Sean V Kelley <seanvk@posteo.de>
(cherry picked from commit 31d499ebdd0fe080d8e3654ab90fede155b148fe)

test/i965_test_fixture.cpp
test/i965_test_fixture.h

index 74403f8..ac44ddf 100644 (file)
@@ -66,12 +66,13 @@ void I965TestFixture::destroySurfaces(Surfaces& surfaces)
 }
 
 VAConfigID I965TestFixture::createConfig(
-    VAProfile profile, VAEntrypoint entrypoint, ConfigAttribs& attribs)
+    VAProfile profile, VAEntrypoint entrypoint, const ConfigAttribs& attribs)
 {
     VAConfigID id = VA_INVALID_ID;
     EXPECT_STATUS(
         i965_CreateConfig(
-            *this, profile, entrypoint, attribs.data(), attribs.size(), &id));
+            *this, profile, entrypoint,
+            const_cast<VAConfigAttrib*>(attribs.data()), attribs.size(), &id));
     EXPECT_ID(id);
 
     return id;
index 3fc11c3..02c1dbb 100644 (file)
@@ -76,7 +76,8 @@ public:
      * Convenience wrapper for i965_CreateConfig.  May generate a non-fatal
      * test assertion failure.
      */
-    VAConfigID createConfig(VAProfile, VAEntrypoint, ConfigAttribs&);
+    VAConfigID createConfig(VAProfile, VAEntrypoint,
+        const ConfigAttribs& = ConfigAttribs());
 
     /**
      * Convenience wrapper for i965_DestroyConfig.  May generate a non-fatal