Disable R5G6B5 conversion in gralloc.

Bug 20891368

Change-Id: Ie293159d2092985c496202eb25733e69f9a3ff6f
Reviewed-on: https://swiftshader-review.googlesource.com/3252
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Common/GrallocAndroid.cpp b/src/Common/GrallocAndroid.cpp
index 307a16f..f96d62a 100644
--- a/src/Common/GrallocAndroid.cpp
+++ b/src/Common/GrallocAndroid.cpp
@@ -2,7 +2,7 @@
 
 #include <cutils/log.h>
 
-GrallocModule* GrallocModule::getInstance()
+GrallocModule *GrallocModule::getInstance()
 {
     static GrallocModule instance;
     return &instance;
@@ -10,22 +10,13 @@
 
 GrallocModule::GrallocModule()
 {
-    const hw_module_t* module;
-    hw_get_module("converting_gralloc", &module);
-    if (module)
-    {
-        m_supportsConversion = true;
-        ALOGI("Loaded converting gralloc");
-    }
-    else
-    {
-        m_supportsConversion = false;
-        ALOGE("Falling back to standard gralloc with reduced format support");
-        hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
-    }
-    if (!module)
+    const hw_module_t *module = nullptr;
+    hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
+
+    if(!module)
     {
         ALOGE("Failed to load standard gralloc");
     }
+
     m_module = reinterpret_cast<const gralloc_module_t*>(module);
 }