[Bf-blender-cvs] [e78412c9052] blender2.8: Cleanup: use const pointer for view access API

Campbell Barton noreply at git.blender.org
Wed Apr 12 06:12:03 CEST 2017


Commit: e78412c9052ba9d839ed5aecc589f800d1d327b0
Author: Campbell Barton
Date:   Wed Apr 12 12:10:01 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe78412c9052ba9d839ed5aecc589f800d1d327b0

Cleanup: use const pointer for view access API

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

M	source/blender/draw/engines/clay/clay.c
M	source/blender/draw/engines/eevee/eevee.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/modes/edit_mesh_mode.c
M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index 2bed0327064..512ed7dfe73 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -340,7 +340,7 @@ static void CLAY_engine_init(void *vedata)
 	}
 
 	{
-		float *viewport_size = DRW_viewport_size_get();
+		const float *viewport_size = DRW_viewport_size_get();
 		DRWFboTexture tex = {&txl->depth_dup, DRW_BUF_DEPTH_24, 0};
 		DRW_framebuffer_init(&fbl->dupli_depth,
 		                     (int)viewport_size[0], (int)viewport_size[1],
@@ -360,7 +360,7 @@ static void CLAY_engine_init(void *vedata)
 		    {-1.0f, 1.0f, -1.0f, 1.0f}
 		};
 		int i;
-		float *size = DRW_viewport_size_get();
+		const float *size = DRW_viewport_size_get();
 
 		DRW_get_dfdy_factors(dfdyfacs);
 
diff --git a/source/blender/draw/engines/eevee/eevee.c b/source/blender/draw/engines/eevee/eevee.c
index 2013df35deb..3b03d00e882 100644
--- a/source/blender/draw/engines/eevee/eevee.c
+++ b/source/blender/draw/engines/eevee/eevee.c
@@ -65,7 +65,7 @@ static void EEVEE_engine_init(void *vedata)
 
 	DRWFboTexture tex = {&txl->color, DRW_BUF_RGBA_16, DRW_TEX_FILTER};
 
-	float *viewport_size = DRW_viewport_size_get();
+	const float *viewport_size = DRW_viewport_size_get();
 	DRW_framebuffer_init(&fbl->main,
 	                    (int)viewport_size[0], (int)viewport_size[1],
 	                    &tex, 1);
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index a19e0c71155..0a7d4dcbfec 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -248,9 +248,9 @@ typedef enum {
 
 void DRW_viewport_init(const bContext *C);
 void DRW_viewport_matrix_get(float mat[4][4], DRWViewportMatrixType type);
-float *DRW_viewport_size_get(void);
-float *DRW_viewport_screenvecs_get(void);
-float *DRW_viewport_pixelsize_get(void);
+const float *DRW_viewport_size_get(void);
+const float *DRW_viewport_screenvecs_get(void);
+const float *DRW_viewport_pixelsize_get(void);
 bool DRW_viewport_is_persp_get(void);
 bool DRW_viewport_cache_is_dirty(void);
 
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index fdf99f906c6..5ad46a75da1 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1318,17 +1318,17 @@ static void *DRW_viewport_engine_data_get(void *engine_type)
 	return data;
 }
 
-float *DRW_viewport_size_get(void)
+const float *DRW_viewport_size_get(void)
 {
 	return &DST.size[0];
 }
 
-float *DRW_viewport_screenvecs_get(void)
+const float *DRW_viewport_screenvecs_get(void)
 {
 	return &DST.screenvecs[0][0];
 }
 
-float *DRW_viewport_pixelsize_get(void)
+const float *DRW_viewport_pixelsize_get(void)
 {
 	return &DST.pixsize;
 }
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 1e4c5836119..dd3f7083b79 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -133,7 +133,7 @@ static void EDIT_MESH_engine_init(void *vedata)
 	EDIT_MESH_TextureList *txl = ((EDIT_MESH_Data *)vedata)->txl;
 	EDIT_MESH_FramebufferList *fbl = ((EDIT_MESH_Data *)vedata)->fbl;
 
-	float *viewport_size = DRW_viewport_size_get();
+	const float *viewport_size = DRW_viewport_size_get();
 
 	DRWFboTexture tex[2] = {{
 	    &txl->occlude_wire_depth_tx, DRW_BUF_DEPTH_24, 0},
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 52c88788557..fc1710421d9 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -209,7 +209,7 @@ static void OBJECT_engine_init(void *vedata)
 	OBJECT_TextureList *txl = ((OBJECT_Data *)vedata)->txl;
 	OBJECT_FramebufferList *fbl = ((OBJECT_Data *)vedata)->fbl;
 
-	float *viewport_size = DRW_viewport_size_get();
+	const float *viewport_size = DRW_viewport_size_get();
 
 	DRWFboTexture tex[2] = {{&txl->outlines_depth_tx, DRW_BUF_DEPTH_24, 0},
 	                        {&txl->outlines_color_tx, DRW_BUF_RGBA_8, DRW_TEX_FILTER}};




More information about the Bf-blender-cvs mailing list