Merge change 2152 into donut

* changes:
  make sure to fail to software when the h/w renderer cannot be initialized