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

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

Merge "fix the api style" into oc-dev

parents 7e73970d 9255e3ea

libs/vr/libdvr/dvr_api.cpp

+48 −48
Original line number Original line Diff line number Diff line
@@ -24,81 +24,81 @@ DVR_EXPORT int dvrGetApi(void* api, size_t struct_size, int version) { 
    DvrApi_v1* dvr_api = static_cast<DvrApi_v1*>(api);

    DvrApi_v1* dvr_api = static_cast<DvrApi_v1*>(api);





    // display_manager_client.h

    // display_manager_client.h

    dvr_api->display_manager_client_create_ = dvrDisplayManagerClientCreate;

    dvr_api->display_manager_client_create = dvrDisplayManagerClientCreate;

    dvr_api->display_manager_client_destroy_ = dvrDisplayManagerClientDestroy;

    dvr_api->display_manager_client_destroy = dvrDisplayManagerClientDestroy;

    dvr_api->display_manager_client_get_surface_list_ =

    dvr_api->display_manager_client_get_surface_list =

        dvrDisplayManagerClientGetSurfaceList;

        dvrDisplayManagerClientGetSurfaceList;

    dvr_api->display_manager_client_surface_list_destroy_ =

    dvr_api->display_manager_client_surface_list_destroy =

        dvrDisplayManagerClientSurfaceListDestroy;

        dvrDisplayManagerClientSurfaceListDestroy;

    dvr_api->display_manager_setup_pose_buffer_ =

    dvr_api->display_manager_setup_pose_buffer =

        dvrDisplayManagerSetupPoseBuffer;

        dvrDisplayManagerSetupPoseBuffer;

    dvr_api->display_manager_client_surface_list_get_size_ =

    dvr_api->display_manager_client_surface_list_get_size =

        dvrDisplayManagerClientSurfaceListGetSize;

        dvrDisplayManagerClientSurfaceListGetSize;

    dvr_api->display_manager_client_surface_list_get_surface_id_ =

    dvr_api->display_manager_client_surface_list_get_surface_id =

        dvrDisplayManagerClientSurfaceListGetSurfaceId;

        dvrDisplayManagerClientSurfaceListGetSurfaceId;

    dvr_api->display_manager_client_get_surface_buffer_list_ =

    dvr_api->display_manager_client_get_surface_buffer_list =

        dvrDisplayManagerClientGetSurfaceBuffers;

        dvrDisplayManagerClientGetSurfaceBuffers;

    dvr_api->display_manager_client_surface_buffer_list_destroy_ =

    dvr_api->display_manager_client_surface_buffer_list_destroy =

        dvrDisplayManagerClientSurfaceBuffersDestroy;

        dvrDisplayManagerClientSurfaceBuffersDestroy;

    dvr_api->display_manager_client_surface_buffer_list_get_size_ =

    dvr_api->display_manager_client_surface_buffer_list_get_size =

        dvrDisplayManagerClientSurfaceBuffersGetSize;

        dvrDisplayManagerClientSurfaceBuffersGetSize;

    dvr_api->display_manager_client_surface_buffer_list_get_fd_ =

    dvr_api->display_manager_client_surface_buffer_list_get_fd =

        dvrDisplayManagerClientSurfaceBuffersGetFd;

        dvrDisplayManagerClientSurfaceBuffersGetFd;





    // dvr_buffer.h

    // dvr_buffer.h

    dvr_api->write_buffer_destroy_ = dvrWriteBufferDestroy;

    dvr_api->write_buffer_destroy = dvrWriteBufferDestroy;

    dvr_api->write_buffer_get_blob_fds_ = dvrWriteBufferGetBlobFds;

    dvr_api->write_buffer_get_blob_fds = dvrWriteBufferGetBlobFds;

    dvr_api->write_buffer_get_AHardwareBuffer_ =

    dvr_api->write_buffer_get_ahardwarebuffer =

        dvrWriteBufferGetAHardwareBuffer;

        dvrWriteBufferGetAHardwareBuffer;

    dvr_api->write_buffer_post_ = dvrWriteBufferPost;

    dvr_api->write_buffer_post = dvrWriteBufferPost;

    dvr_api->write_buffer_gain_ = dvrWriteBufferGain;

    dvr_api->write_buffer_gain = dvrWriteBufferGain;

    dvr_api->write_buffer_gain_async_ = dvrWriteBufferGainAsync;

    dvr_api->write_buffer_gain_async = dvrWriteBufferGainAsync;





    dvr_api->read_buffer_destroy_ = dvrReadBufferDestroy;

    dvr_api->read_buffer_destroy = dvrReadBufferDestroy;

    dvr_api->read_buffer_get_blob_fds_ = dvrReadBufferGetBlobFds;

    dvr_api->read_buffer_get_blob_fds = dvrReadBufferGetBlobFds;

    dvr_api->read_buffer_get_AHardwareBuffer_ = dvrReadBufferGetAHardwareBuffer;

    dvr_api->read_buffer_get_ahardwarebuffer = dvrReadBufferGetAHardwareBuffer;

    dvr_api->read_buffer_acquire_ = dvrReadBufferAcquire;

    dvr_api->read_buffer_acquire = dvrReadBufferAcquire;

    dvr_api->read_buffer_release_ = dvrReadBufferRelease;

    dvr_api->read_buffer_release = dvrReadBufferRelease;

    dvr_api->read_buffer_release_async_ = dvrReadBufferReleaseAsync;

    dvr_api->read_buffer_release_async = dvrReadBufferReleaseAsync;





    // dvr_buffer_queue.h

    // dvr_buffer_queue.h

    dvr_api->write_buffer_queue_destroy_ = dvrWriteBufferQueueDestroy;

    dvr_api->write_buffer_queue_destroy = dvrWriteBufferQueueDestroy;

    dvr_api->write_buffer_queue_get_capacity_ = dvrWriteBufferQueueGetCapacity;

    dvr_api->write_buffer_queue_get_capacity = dvrWriteBufferQueueGetCapacity;

    dvr_api->write_buffer_queue_get_external_surface_ =

    dvr_api->write_buffer_queue_get_external_surface =

        dvrWriteBufferQueueGetExternalSurface;

        dvrWriteBufferQueueGetExternalSurface;

    dvr_api->write_buffer_queue_create_read_queue_ =

    dvr_api->write_buffer_queue_create_read_queue =

        dvrWriteBufferQueueCreateReadQueue;

        dvrWriteBufferQueueCreateReadQueue;

    dvr_api->write_buffer_queue_dequeue_ = dvrWriteBufferQueueDequeue;

    dvr_api->write_buffer_queue_dequeue = dvrWriteBufferQueueDequeue;

    dvr_api->read_buffer_queue_destroy_ = dvrReadBufferQueueDestroy;

    dvr_api->read_buffer_queue_destroy = dvrReadBufferQueueDestroy;

    dvr_api->read_buffer_queue_get_capacity_ = dvrReadBufferQueueGetCapacity;

    dvr_api->read_buffer_queue_get_capacity = dvrReadBufferQueueGetCapacity;

    dvr_api->read_buffer_queue_create_read_queue_ =

    dvr_api->read_buffer_queue_create_read_queue =

        dvrReadBufferQueueCreateReadQueue;

        dvrReadBufferQueueCreateReadQueue;

    dvr_api->read_buffer_queue_dequeue = dvrReadBufferQueueDequeue;

    dvr_api->read_buffer_queue_dequeue = dvrReadBufferQueueDequeue;





    // dvr_surface.h

    // dvr_surface.h

    dvr_api->get_pose_buffer_ = dvrGetPoseBuffer;

    dvr_api->get_pose_buffer = dvrGetPoseBuffer;

    dvr_api->surface_create_ = dvrSurfaceCreate;

    dvr_api->surface_create = dvrSurfaceCreate;

    dvr_api->surface_get_write_buffer_queue_ = dvrSurfaceGetWriteBufferQueue;

    dvr_api->surface_get_write_buffer_queue = dvrSurfaceGetWriteBufferQueue;





    // vsync_client_api.h

    // vsync_client_api.h

    dvr_api->vsync_client_create_ = dvr_vsync_client_create;

    dvr_api->vsync_client_create = dvr_vsync_client_create;

    dvr_api->vsync_client_destroy_ = dvr_vsync_client_destroy;

    dvr_api->vsync_client_destroy = dvr_vsync_client_destroy;

    dvr_api->vsync_client_get_sched_info_ = dvr_vsync_client_get_sched_info;

    dvr_api->vsync_client_get_sched_info = dvr_vsync_client_get_sched_info;





    // pose_client.h

    // pose_client.h

    dvr_api->pose_client_create_ = dvrPoseCreate;

    dvr_api->pose_client_create = dvrPoseCreate;

    dvr_api->pose_client_destroy_ = dvrPoseDestroy;

    dvr_api->pose_client_destroy = dvrPoseDestroy;

    dvr_api->pose_get_ = dvrPoseGet;

    dvr_api->pose_get = dvrPoseGet;

    dvr_api->pose_get_vsync_count_ = dvrPoseGetVsyncCount;

    dvr_api->pose_get_vsync_count = dvrPoseGetVsyncCount;

    dvr_api->pose_get_controller_ = dvrPoseGetController;

    dvr_api->pose_get_controller = dvrPoseGetController;





    // virtual_touchpad_client.h

    // virtual_touchpad_client.h

    dvr_api->virtual_touchpad_create_ = dvrVirtualTouchpadCreate;

    dvr_api->virtual_touchpad_create = dvrVirtualTouchpadCreate;

    dvr_api->virtual_touchpad_destroy_ = dvrVirtualTouchpadDestroy;

    dvr_api->virtual_touchpad_destroy = dvrVirtualTouchpadDestroy;

    dvr_api->virtual_touchpad_attach_ = dvrVirtualTouchpadAttach;

    dvr_api->virtual_touchpad_attach = dvrVirtualTouchpadAttach;

    dvr_api->virtual_touchpad_detach_ = dvrVirtualTouchpadDetach;

    dvr_api->virtual_touchpad_detach = dvrVirtualTouchpadDetach;

    dvr_api->virtual_touchpad_touch_ = dvrVirtualTouchpadTouch;

    dvr_api->virtual_touchpad_touch = dvrVirtualTouchpadTouch;

    dvr_api->virtual_touchpad_button_state_ = dvrVirtualTouchpadButtonState;

    dvr_api->virtual_touchpad_button_state = dvrVirtualTouchpadButtonState;





    return 0;

    return 0;

  }

  }

libs/vr/libdvr/include/dvr/dvr_api.h

+48 −48
Original line number Original line Diff line number Diff line
@@ -146,80 +146,80 @@ typedef int (*DvrVirtualTouchpadButtonStatePtr)(DvrVirtualTouchpad* client, 




struct DvrApi_v1 {

struct DvrApi_v1 {

  // Display manager client

  // Display manager client

  DvrDisplayManagerClientCreatePtr display_manager_client_create_;

  DvrDisplayManagerClientCreatePtr display_manager_client_create;

  DvrDisplayManagerClientDestroyPtr display_manager_client_destroy_;

  DvrDisplayManagerClientDestroyPtr display_manager_client_destroy;

  DvrDisplayManagerClientGetSurfaceListPtr

  DvrDisplayManagerClientGetSurfaceListPtr

      display_manager_client_get_surface_list_;

      display_manager_client_get_surface_list;

  DvrDisplayManagerClientSurfaceListDestroyPtr

  DvrDisplayManagerClientSurfaceListDestroyPtr

      display_manager_client_surface_list_destroy_;

      display_manager_client_surface_list_destroy;

  DvrDisplayManagerSetupPoseBufferPtr display_manager_setup_pose_buffer_;

  DvrDisplayManagerSetupPoseBufferPtr display_manager_setup_pose_buffer;

  DvrDisplayManagerClientSurfaceListGetSizePtr

  DvrDisplayManagerClientSurfaceListGetSizePtr

      display_manager_client_surface_list_get_size_;

      display_manager_client_surface_list_get_size;

  DvrDisplayManagerClientSurfaceListGetSurfaceIdPtr

  DvrDisplayManagerClientSurfaceListGetSurfaceIdPtr

      display_manager_client_surface_list_get_surface_id_;

      display_manager_client_surface_list_get_surface_id;

  DvrDisplayManagerClientGetSurfaceBufferListPtr

  DvrDisplayManagerClientGetSurfaceBufferListPtr

      display_manager_client_get_surface_buffer_list_;

      display_manager_client_get_surface_buffer_list;

  DvrDisplayManagerClientSurfaceBufferListDestroyPtr

  DvrDisplayManagerClientSurfaceBufferListDestroyPtr

      display_manager_client_surface_buffer_list_destroy_;

      display_manager_client_surface_buffer_list_destroy;

  DvrDisplayManagerClientSurfaceBufferListGetSizePtr

  DvrDisplayManagerClientSurfaceBufferListGetSizePtr

      display_manager_client_surface_buffer_list_get_size_;

      display_manager_client_surface_buffer_list_get_size;

  DvrDisplayManagerClientSurfaceBufferListGetFdPtr

  DvrDisplayManagerClientSurfaceBufferListGetFdPtr

      display_manager_client_surface_buffer_list_get_fd_;

      display_manager_client_surface_buffer_list_get_fd;





  // Write buffer

  // Write buffer

  DvrWriteBufferDestroyPtr write_buffer_destroy_;

  DvrWriteBufferDestroyPtr write_buffer_destroy;

  DvrWriteBufferGetBlobFdsPtr write_buffer_get_blob_fds_;

  DvrWriteBufferGetBlobFdsPtr write_buffer_get_blob_fds;

  DvrWriteBufferGetAHardwareBufferPtr write_buffer_get_AHardwareBuffer_;

  DvrWriteBufferGetAHardwareBufferPtr write_buffer_get_ahardwarebuffer;

  DvrWriteBufferPostPtr write_buffer_post_;

  DvrWriteBufferPostPtr write_buffer_post;

  DvrWriteBufferGainPtr write_buffer_gain_;

  DvrWriteBufferGainPtr write_buffer_gain;

  DvrWriteBufferGainAsyncPtr write_buffer_gain_async_;

  DvrWriteBufferGainAsyncPtr write_buffer_gain_async;





  // Read buffer

  // Read buffer

  DvrReadBufferDestroyPtr read_buffer_destroy_;

  DvrReadBufferDestroyPtr read_buffer_destroy;

  DvrReadBufferGetBlobFdsPtr read_buffer_get_blob_fds_;

  DvrReadBufferGetBlobFdsPtr read_buffer_get_blob_fds;

  DvrReadBufferGetAHardwareBufferPtr read_buffer_get_AHardwareBuffer_;

  DvrReadBufferGetAHardwareBufferPtr read_buffer_get_ahardwarebuffer;

  DvrReadBufferAcquirePtr read_buffer_acquire_;

  DvrReadBufferAcquirePtr read_buffer_acquire;

  DvrReadBufferReleasePtr read_buffer_release_;

  DvrReadBufferReleasePtr read_buffer_release;

  DvrReadBufferReleaseAsyncPtr read_buffer_release_async_;

  DvrReadBufferReleaseAsyncPtr read_buffer_release_async;





  // Write buffer queue

  // Write buffer queue

  DvrWriteBufferQueueDestroyPtr write_buffer_queue_destroy_;

  DvrWriteBufferQueueDestroyPtr write_buffer_queue_destroy;

  DvrWriteBufferQueueGetCapacityPtr write_buffer_queue_get_capacity_;

  DvrWriteBufferQueueGetCapacityPtr write_buffer_queue_get_capacity;

  DvrWriteBufferQueueGetExternalSurfacePtr

  DvrWriteBufferQueueGetExternalSurfacePtr

      write_buffer_queue_get_external_surface_;

      write_buffer_queue_get_external_surface;

  DvrWriteBufferQueueCreateReadQueuePtr write_buffer_queue_create_read_queue_;

  DvrWriteBufferQueueCreateReadQueuePtr write_buffer_queue_create_read_queue;

  DvrWriteBufferQueueDequeuePtr write_buffer_queue_dequeue_;

  DvrWriteBufferQueueDequeuePtr write_buffer_queue_dequeue;





  // Read buffer queue

  // Read buffer queue

  DvrReadBufferQueueDestroyPtr read_buffer_queue_destroy_;

  DvrReadBufferQueueDestroyPtr read_buffer_queue_destroy;

  DvrReadBufferQueueGetCapacityPtr read_buffer_queue_get_capacity_;

  DvrReadBufferQueueGetCapacityPtr read_buffer_queue_get_capacity;

  DvrReadBufferQueueCreateReadQueuePtr read_buffer_queue_create_read_queue_;

  DvrReadBufferQueueCreateReadQueuePtr read_buffer_queue_create_read_queue;

  DvrReadBufferQueueDequeuePtr read_buffer_queue_dequeue;

  DvrReadBufferQueueDequeuePtr read_buffer_queue_dequeue;





  // V-Sync client

  // V-Sync client

  DvrVSyncClientCreatePtr vsync_client_create_;

  DvrVSyncClientCreatePtr vsync_client_create;

  DvrVSyncClientDestroyPtr vsync_client_destroy_;

  DvrVSyncClientDestroyPtr vsync_client_destroy;

  DvrVSyncClientGetSchedInfoPtr vsync_client_get_sched_info_;

  DvrVSyncClientGetSchedInfoPtr vsync_client_get_sched_info;





  // Display surface

  // Display surface

  DvrGetPoseBufferPtr get_pose_buffer_;

  DvrGetPoseBufferPtr get_pose_buffer;

  DvrSurfaceCreatePtr surface_create_;

  DvrSurfaceCreatePtr surface_create;

  DvrSurfaceGetWriteBufferQueuePtr surface_get_write_buffer_queue_;

  DvrSurfaceGetWriteBufferQueuePtr surface_get_write_buffer_queue;





  // Pose client

  // Pose client

  DvrPoseClientCreatePtr pose_client_create_;

  DvrPoseClientCreatePtr pose_client_create;

  DvrPoseClientDestroyPtr pose_client_destroy_;

  DvrPoseClientDestroyPtr pose_client_destroy;

  DvrPoseGetPtr pose_get_;

  DvrPoseGetPtr pose_get;

  DvrPoseGetVsyncCountPtr pose_get_vsync_count_;

  DvrPoseGetVsyncCountPtr pose_get_vsync_count;

  DvrPoseGetControllerPtr pose_get_controller_;

  DvrPoseGetControllerPtr pose_get_controller;





  // Virtual touchpad client

  // Virtual touchpad client

  DvrVirtualTouchpadCreatePtr virtual_touchpad_create_;

  DvrVirtualTouchpadCreatePtr virtual_touchpad_create;

  DvrVirtualTouchpadDestroyPtr virtual_touchpad_destroy_;

  DvrVirtualTouchpadDestroyPtr virtual_touchpad_destroy;

  DvrVirtualTouchpadAttachPtr virtual_touchpad_attach_;

  DvrVirtualTouchpadAttachPtr virtual_touchpad_attach;

  DvrVirtualTouchpadDetachPtr virtual_touchpad_detach_;

  DvrVirtualTouchpadDetachPtr virtual_touchpad_detach;

  DvrVirtualTouchpadTouchPtr virtual_touchpad_touch_;

  DvrVirtualTouchpadTouchPtr virtual_touchpad_touch;

  DvrVirtualTouchpadButtonStatePtr virtual_touchpad_button_state_;

  DvrVirtualTouchpadButtonStatePtr virtual_touchpad_button_state;

};

};





int dvrGetApi(void* api, size_t struct_size, int version);

int dvrGetApi(void* api, size_t struct_size, int version);