commit b268abd5528936d13a85b03f44458fe3a55cafad
author Jon Parr <jon.parr@imgtec.com> Thu Jun 11 14:27:51 2015 +0100
committer Stephen Hines <srhines@google.com> Mon Jun 15 13:17:14 2015 -0700
tree 06707a0ca86b622b6f6ea64c557c7c41bee26473
parent 0b1e83a8a6ec5c11032c904b1fcb1908a5b8c845

Allow drivers to alter the default driver name on rsdHalInit

Bug: 20894432

Permit partner drivers via Context::setDriverName to choose their
own mDriverName rather than the default OVERRIDE_RS_DRIVER string.

This can only be done once from within rsdHalInit otherwise it will
be ignored and the default behaviour will apply.

Change-Id: I49b81e60f7983a81f0e71fbef4b46f9bfc834849

rsContext.h

diff --git a/rsContext.h b/rsContext.h
index 918e5e3..09b7483 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -290,6 +290,14 @@
         return mDriverName;
     }
 
+    // Set a new driver name, should be called from within
+    // rsdHalInit in order to alter default behaviour.
+    void setDriverName(const char * name) {
+        if (!mDriverName) {
+            mDriverName = name;
+        }
+    }
+
 
 protected:
 

rsDriverLoader.cpp

diff --git a/rsDriverLoader.cpp b/rsDriverLoader.cpp
index 5bfb8e5..7b728b6 100644
--- a/rsDriverLoader.cpp
+++ b/rsDriverLoader.cpp
@@ -207,7 +207,7 @@
     }
 
     // Only map in the actual driver name if we successfully load the runtime.
-    mDriverName = filename;
+    setDriverName(filename);
 
     return true;