[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41258] trunk/blender/source/blender: Remove currently unused IMB_cache_limiter_* function.

Sergey Sharybin g.ulairi at gmail.com
Mon Oct 24 19:26:25 CEST 2011


Revision: 41258
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41258
Author:   nazgul
Date:     2011-10-24 17:26:24 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Remove currently unused IMB_cache_limiter_* function.
Would be replaced with movie cache soon.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/imbuf/IMB_imbuf.h
    trunk/blender/source/blender/imbuf/intern/allocimbuf.c
    trunk/blender/source/blender/imbuf/intern/module.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-10-24 17:12:28 UTC (rev 41257)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2011-10-24 17:26:24 UTC (rev 41258)
@@ -2505,9 +2505,6 @@
 
 		for (e = prefetch_done.first; e; e = e->next) {
 			if (s_last > e->monoton_cfra) {
-				if (e->ibuf) {
-					IMB_cache_limiter_unref(e->ibuf);
-				}
 				BLI_remlink(&prefetch_done, e);
 				MEM_freeN(e);
 			}
@@ -2585,9 +2582,6 @@
 	}
 
 	for (e = prefetch_done.first; e; e = e->next) {
-		if (e->ibuf) {
-			IMB_cache_limiter_unref(e->ibuf);
-		}
 		BLI_remlink(&prefetch_done, e);
 		MEM_freeN(e);
 	}

Modified: trunk/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf.h	2011-10-24 17:12:28 UTC (rev 41257)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf.h	2011-10-24 17:26:24 UTC (rev 41258)
@@ -137,19 +137,6 @@
  *
  * @attention Defined in allocimbuf.c
  */
-void IMB_cache_limiter_insert(struct ImBuf *i);
-void IMB_cache_limiter_unmanage(struct ImBuf *i);
-void IMB_cache_limiter_touch(struct ImBuf *i);
-void IMB_cache_limiter_ref(struct ImBuf *i);
-void IMB_cache_limiter_unref(struct ImBuf *i);
-int IMB_cache_limiter_get_refcount(struct ImBuf *i);
-
-void IMB_free_cache_limiter(void);
-
-/**
- *
- * @attention Defined in allocimbuf.c
- */
 struct ImBuf *IMB_dupImBuf(struct ImBuf *ibuf1);
 
 /**

Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c	2011-10-24 17:12:28 UTC (rev 41257)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c	2011-10-24 17:26:24 UTC (rev 41258)
@@ -164,7 +164,6 @@
 			IMB_freezbufImBuf(ibuf);
 			IMB_freezbuffloatImBuf(ibuf);
 			freeencodedbufferImBuf(ibuf);
-			IMB_cache_limiter_unmanage(ibuf);
 			IMB_metadata_free(ibuf);
 			MEM_freeN(ibuf);
 		}
@@ -471,56 +470,3 @@
 
 	return &c;
 }
-
-void IMB_free_cache_limiter(void)
-{
-	delete_MEM_CacheLimiter(*get_imbuf_cache_limiter());
-	*get_imbuf_cache_limiter() = NULL;
-}
-
-void IMB_cache_limiter_insert(ImBuf *i)
-{
-	if(!i->c_handle) {
-		i->c_handle = MEM_CacheLimiter_insert(
-			*get_imbuf_cache_limiter(), i);
-		MEM_CacheLimiter_ref(i->c_handle);
-		MEM_CacheLimiter_enforce_limits(
-			*get_imbuf_cache_limiter());
-		MEM_CacheLimiter_unref(i->c_handle);
-	}
-}
-
-void IMB_cache_limiter_unmanage(ImBuf *i)
-{
-	if(i->c_handle) {
-		MEM_CacheLimiter_unmanage(i->c_handle);
-		i->c_handle = NULL;
-	}
-}
-
-void IMB_cache_limiter_touch(ImBuf *i)
-{
-	if(i->c_handle)
-		MEM_CacheLimiter_touch(i->c_handle);
-}
-
-void IMB_cache_limiter_ref(ImBuf *i)
-{
-	if(i->c_handle)
-		MEM_CacheLimiter_ref(i->c_handle);
-}
-
-void IMB_cache_limiter_unref(ImBuf *i)
-{
-	if(i->c_handle)
-		MEM_CacheLimiter_unref(i->c_handle);
-}
-
-int IMB_cache_limiter_get_refcount(ImBuf *i)
-{
-	if(i->c_handle)
-		return MEM_CacheLimiter_get_refcount(i->c_handle);
-
-	return 0;
-}
-

Modified: trunk/blender/source/blender/imbuf/intern/module.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/module.c	2011-10-24 17:12:28 UTC (rev 41257)
+++ trunk/blender/source/blender/imbuf/intern/module.c	2011-10-24 17:26:24 UTC (rev 41258)
@@ -37,7 +37,6 @@
 
 void IMB_exit(void)
 {
-	IMB_free_cache_limiter();
 	imb_tile_cache_exit();
 	imb_filetypes_exit();
 }




More information about the Bf-blender-cvs mailing list