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

Commit 7777e9f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Proper fix for vr_wm: the hwc_callback function is no longer called"

parents 0576a885 c9e2f79c

services/vr/vr_window_manager/composer/impl/vr_hwc.cpp

+5 −4
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ sp<GraphicBuffer> GetBufferFromHandle(const native_handle_t* handle) { 
  int32_t format = 0;



  GraphicBufferMapper& mapper = GraphicBufferMapper::get();

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

    ALOGE("Failed to register buffer");

    return nullptr;

  }



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

      mapper.getStride(handle, &stride) ||

      mapper.getFormat(handle, &format) ||
@@ -64,10 +69,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;

}

services/vr/vr_window_manager/hwc_callback.cpp

+0 −31
Original line number Diff line number Diff line
@@ -11,37 +11,6 @@ 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;



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

      mapper.getStride(handle, &stride) ||

      mapper.getFormat(handle, &format) ||

      mapper.getProducerUsage(handle, &producer_usage) ||

      mapper.getConsumerUsage(handle, &consumer_usage)) {

    ALOGE("Failed to read handle properties");

    return nullptr;

  }



  // This will only succeed if gralloc has GRALLOC1_CAPABILITY_LAYERED_BUFFERS

  // capability. Otherwise assume a count of 1.

  mapper.getLayerCount(handle, &layer_count);



  sp<GraphicBuffer> buffer = new GraphicBuffer(

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

      stride, native_handle_clone(handle), true);



  return buffer;

}



HwcCallback::FrameStatus GetFrameStatus(const HwcCallback::Frame& frame) {

  for (const auto& layer : frame.layers()) {

    // If there is no fence it means the buffer is already finished.