Commit 812bfda1 authored by emerit's avatar emerit
Browse files

fix merge error

parent 8da62e8c

lib_rend/lib_rend.h

+0 −8
Original line number Diff line number Diff line
@@ -246,13 +246,6 @@ int16_t IVAS_REND_FeedRenderConfig( 
    const IVAS_RENDER_CONFIG_DATA renderConfig      /* i  : Render configuration struct                         */

);



#ifdef TD5

ivas_error IVAS_REND_SetHeadRotationAndPosition(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                     */

    const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i  : head orientation for next rendering call */

    const float Pos[RENDERER_HEAD_POSITIONS_PER_FRAME][3] /* i  : head positions for next rendering call */

);

#else

ivas_error IVAS_REND_SetHeadRotation(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                     */

#ifdef TD5
@@ -262,7 +255,6 @@ ivas_error IVAS_REND_SetHeadRotation( 
    const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i  : head positions for next rendering call */

#endif

);

#endif



#ifdef FIX_I109_ORIENTATION_TRACKING

ivas_error IVAS_REND_SetOrientationTrackingMode(