From 068f755882884a180feaf1a37e287bb5d01460d1 Mon Sep 17 00:00:00 2001 From: Jiwen 'Steve' Cai Date: Tue, 10 Oct 2017 17:48:53 -0700 Subject: Revert "Comment out unused parameter." This reverts commit a548ce9f118392bfa867481d4e47423fc7bfc3d8. Need to temporarily revert this CL to let ag/3019931 merged in from oc-mr1-dev. Bug: 65455724 Test: Normal build with and wihout ag/3019931 Change-Id: Id27a48187bb7eb7f84532108712fa0b32fb84974 --- libs/vr/libdvr/dvr_buffer_queue.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vr/libdvr/dvr_buffer_queue.cpp b/libs/vr/libdvr/dvr_buffer_queue.cpp index a4c953624a..035252d0b9 100644 --- a/libs/vr/libdvr/dvr_buffer_queue.cpp +++ b/libs/vr/libdvr/dvr_buffer_queue.cpp @@ -151,7 +151,7 @@ int DvrWriteBufferQueue::Dequeue(int timeout, DvrWriteBuffer* write_buffer, int DvrWriteBufferQueue::GainBuffer(int timeout, DvrWriteBuffer** out_write_buffer, - DvrNativeBufferMetadata* /* out_meta */, + DvrNativeBufferMetadata* out_meta, int* out_fence_fd) { DvrWriteBuffer write_buffer; int fence_fd; @@ -438,7 +438,7 @@ int DvrReadBufferQueue::AcquireBuffer(int timeout, } int DvrReadBufferQueue::ReleaseBuffer(DvrReadBuffer* read_buffer, - const DvrNativeBufferMetadata* /* meta */, + const DvrNativeBufferMetadata* meta, int release_fence_fd) { LOG_FATAL_IF( (read_buffers->slot < 0 || read_buffers->slot >= read_buffers_size()), -- cgit v1.2.3-59-g8ed1b