Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd7143e authored by Albert Chaulk's avatar Albert Chaulk Committed by Alex Sakhartchouk
Browse files

Fix vr_wm's importing of buffers. Register needs to be first now 

Test: Use VrModeTester to launch into vr mode, verify vr_wm gets buffers
Bug: None
Change-Id: I17a65dc822454386f392cfdd9ffb401055363515
parent 6803c3e2

services/vr/vr_window_manager/hwc_callback.cpp

+6 −5
Original line number Diff line number Diff line
@@ -12,11 +12,16 @@ namespace dvr { 
namespace {



sp<GraphicBuffer> GetBufferFromHandle(const native_handle_t* handle) {

  GraphicBufferMapper& mapper = GraphicBufferMapper::get();

  if (mapper.registerBuffer(handle) != OK) {

    ALOGE("Failed to register buffer");

    return nullptr;

  }



  uint32_t width = 0, height = 0, stride = 0, layer_count = 1;

  uint64_t producer_usage = 0, consumer_usage = 0;

  int32_t format = 0;



  GraphicBufferMapper& mapper = GraphicBufferMapper::get();

  if (mapper.getDimensions(handle, &width, &height) ||

      mapper.getStride(handle, &stride) ||

      mapper.getFormat(handle, &format) ||
@@ -33,10 +38,6 @@ sp<GraphicBuffer> GetBufferFromHandle(const native_handle_t* handle) { 
  sp<GraphicBuffer> buffer = new GraphicBuffer(

      width, height, format, layer_count, producer_usage, consumer_usage,

      stride, native_handle_clone(handle), true);

  if (mapper.registerBuffer(buffer.get()) != OK) {

    ALOGE("Failed to register buffer");

    return nullptr;

  }



  return buffer;

}