X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-tracker.h;h=307e1014d1a8b7f3d08da93085ea582d95f74a0c;hb=649ec06daecb510fb84fe4642a6af957f127e7ab;hp=f6b3b87ac9419f7bb2c6c5dff82c1f53703ec10c;hpb=5c66381841dd4dfd82c5a118d34104a00a2e0e1c;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/common/render-tracker.h b/dali/internal/render/common/render-tracker.h index f6b3b87..307e101 100644 --- a/dali/internal/render/common/render-tracker.h +++ b/dali/internal/render/common/render-tracker.h @@ -1,21 +1,22 @@ -#ifndef __DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_H -#define __DALI_INTERNAL_SCENE_GRAPH_RENDER_TRACKER_H - -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +#ifndef __DALI_INTERNAL_RENDER_RENDER_TRACKER_H +#define __DALI_INTERNAL_RENDER_RENDER_TRACKER_H + +/* + * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #include #include @@ -24,7 +25,7 @@ namespace Dali { namespace Internal { -namespace SceneGraph +namespace Render { /** @@ -36,21 +37,18 @@ class RenderTracker public: /** * Constructor - * @param[in] glSyncAbstraction The GlSyncAbstraction - * @param[in] resourceId The resource ID of the framebuffer texture being tracked */ - RenderTracker(Integration::GlSyncAbstraction& glSyncAbstraction); + RenderTracker(); /** * Destructor - * Delete any outstanding sync objects? */ ~RenderTracker(); /** * Creates a sync object for this tracker. Will delete any existing sync object. */ - void CreateSyncObject(); + void CreateSyncObject( Integration::GlSyncAbstraction& glSyncAbstraction ); /** * Check the GL Sync objects. This is called from Render Thread. @@ -76,14 +74,18 @@ public: void SetSyncFlag(); private: - Integration::GlSyncAbstraction& mGlSyncAbstraction; // The sync abstraction - volatile int mSyncTrigger; // Trigger that update thread can read & reset + + Integration::GlSyncAbstraction* mGlSyncAbstraction; // The sync abstraction Integration::GlSyncAbstraction::SyncObject* mSyncObject; // Associated sync object + volatile int mSyncTrigger; // Trigger that update thread can read + }; -} // SceneGraph +} // Render + } // Internal + } // Dali -#endif // __DALI_INTERNAL_RENDER_TRACKER_H +#endif // __DALI_INTERNAL_RENDER_RENDER_TRACKER_H