[Bf-blender-cvs] [720fbf540ac] temp-lanpr-cleanup: LANPR: Added 8k and 16k cache size options.

[YimingWu]

Commit: 720fbf540acb42a087594bb59b1baa7bd48849f2
Author: YimingWu
Date:   Tue Sep 17 08:27:34 2019 +0800
Branches: temp-lanpr-cleanup
https://developer.blender.org/rB720fbf540acb42a087594bb59b1baa7bd48849f2

LANPR: Added 8k and 16k cache size options.

===================================================================

M	source/blender/draw/engines/lanpr/lanpr_dpix.c
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index dd136b5f378..eb3afb9e6b4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -69,6 +69,10 @@ int lanpr_dpix_texture_size(SceneLANPR *lanpr)
       return 2048;
     case LANPR_GPU_CACHE_SIZE_4K:
       return 4096;
+    case LANPR_GPU_CACHE_SIZE_8K:
+      return 8192;
+    case LANPR_GPU_CACHE_SIZE_16K:
+      return 16384;
   }
   return 512;
 }
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 45c299b4509..0e7bebfa019 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1718,6 +1718,8 @@ enum {
   LANPR_GPU_CACHE_SIZE_1K = 1, /* default */
   LANPR_GPU_CACHE_SIZE_2K = 2,
   LANPR_GPU_CACHE_SIZE_4K = 3,
+  LANPR_GPU_CACHE_SIZE_8K = 4,
+  LANPR_GPU_CACHE_SIZE_16K = 5,
 };
 
 /* *************************************************************** */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 706aea170bb..c04ba3bebbd 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7161,6 +7161,8 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
       {LANPR_GPU_CACHE_SIZE_1K, "S1K", 0, "1K", "1K px texture as cache"},
       {LANPR_GPU_CACHE_SIZE_2K, "S2K", 0, "2K", "2K px texture as cache"},
       {LANPR_GPU_CACHE_SIZE_4K, "S4K", 0, "4K", "4K px texture as cache"},
+      {LANPR_GPU_CACHE_SIZE_8K, "S8K", 0, "8K", "8K px texture as cache"},
+      {LANPR_GPU_CACHE_SIZE_16K, "S16K", 0, "16K", "16K px texture as cache"},
       {0, NULL, 0, NULL, NULL}};
 
   srna = RNA_def_struct(brna, "SceneLANPR", NULL);