[Bf-blender-cvs] [3f915670526] blender2.8: Cleanup: draw engine
Campbell Barton
noreply at git.blender.org
Wed Apr 26 09:40:50 CEST 2017
Commit: 3f915670526c00b27eb95c69503956cf38c05995
Author: Campbell Barton
Date: Wed Apr 26 17:42:39 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB3f915670526c00b27eb95c69503956cf38c05995
Cleanup: draw engine
- use DRW_engine prefix for engine types.
- use engine suffix for files that define a draw engine.
- remove engines from include path (they're only referenced once)
===================================================================
M source/blender/draw/CMakeLists.txt
R099 source/blender/draw/engines/clay/clay.c source/blender/draw/engines/clay/clay_engine.c
R082 source/blender/draw/engines/clay/clay.h source/blender/draw/engines/clay/clay_engine.h
R099 source/blender/draw/engines/eevee/eevee.c source/blender/draw/engines/eevee/eevee_engine.c
R083 source/blender/draw/engines/eevee/eevee.h source/blender/draw/engines/eevee/eevee_engine.h
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_probes.c
M source/blender/draw/engines/select/select_engine.c
M source/blender/draw/engines/select/select_engine.h
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 6bd087e3500..d0e6002bb22 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -26,9 +26,6 @@
set(INC
.
intern
- engines/clay
- engines/eevee
- engines/select
modes
../blenfont
@@ -67,13 +64,13 @@ set(SRC
intern/draw_cache_impl_lattice.c
intern/draw_cache_impl_mesh.c
- engines/clay/clay.c
- engines/clay/clay.h
+ engines/clay/clay_engine.c
+ engines/clay/clay_engine.h
- engines/eevee/eevee.c
+ engines/eevee/eevee_engine.c
+ engines/eevee/eevee_engine.h
engines/eevee/eevee_lights.c
engines/eevee/eevee_probes.c
- engines/eevee/eevee.h
engines/eevee/eevee_private.h
engines/select/select_engine.c
diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay_engine.c
similarity index 99%
rename from source/blender/draw/engines/clay/clay.c
rename to source/blender/draw/engines/clay/clay_engine.c
index 3466f4f8b67..a5dc855089e 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -34,7 +34,7 @@
#include "UI_resources.h"
#include "UI_interface_icons.h"
-#include "clay.h"
+#include "clay_engine.h"
#ifdef WITH_CLAY_ENGINE
/* Shaders */
@@ -656,7 +656,7 @@ DrawEngineType draw_engine_clay_type = {
&CLAY_draw_scene
};
-RenderEngineType viewport_clay_type = {
+RenderEngineType DRW_engine_viewport_clay_type = {
NULL, NULL,
CLAY_ENGINE, N_("Clay"), RE_INTERNAL | RE_USE_OGL_PIPELINE,
NULL, NULL, NULL, NULL, NULL, NULL, &CLAY_collection_settings_create,
diff --git a/source/blender/draw/engines/clay/clay.h b/source/blender/draw/engines/clay/clay_engine.h
similarity index 82%
rename from source/blender/draw/engines/clay/clay.h
rename to source/blender/draw/engines/clay/clay_engine.h
index 660ad70ab48..9d07c6c217b 100644
--- a/source/blender/draw/engines/clay/clay.h
+++ b/source/blender/draw/engines/clay/clay_engine.h
@@ -19,17 +19,17 @@
*
*/
-/** \file clay.h
- * \ingroup DNA
+/** \file clay_engine.h
+ * \ingroup draw_engine
*/
-#ifndef __CLAY_H__
-#define __CLAY_H__
+#ifndef __CLAY_ENGINE_H__
+#define __CLAY_ENGINE_H__
-extern RenderEngineType viewport_clay_type;
+extern RenderEngineType DRW_engine_viewport_clay_type;
struct IDProperty;
struct IDProperty *CLAY_render_settings_create(void);
-#endif /* __CLAY_H__ */
+#endif /* __CLAY_ENGINE_H__ */
diff --git a/source/blender/draw/engines/eevee/eevee.c b/source/blender/draw/engines/eevee/eevee_engine.c
similarity index 99%
rename from source/blender/draw/engines/eevee/eevee.c
rename to source/blender/draw/engines/eevee/eevee_engine.c
index 6ae29ba33a9..5bab508e9d8 100644
--- a/source/blender/draw/engines/eevee/eevee.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -19,8 +19,8 @@
*
*/
-/** \file eevee.c
- * \ingroup DNA
+/** \file eevee_engine.c
+ * \ingroup draw_engine
*/
#include "DRW_render.h"
@@ -31,7 +31,7 @@
#include "BLI_rand.h"
#include "GPU_glew.h"
-#include "eevee.h"
+#include "eevee_engine.h"
#include "eevee_private.h"
#include "eevee_lut.h"
@@ -616,7 +616,7 @@ DrawEngineType draw_engine_eevee_type = {
NULL//&EEVEE_draw_scene
};
-RenderEngineType viewport_eevee_type = {
+RenderEngineType DRW_engine_viewport_eevee_type = {
NULL, NULL,
EEVEE_ENGINE, N_("Eevee"), RE_INTERNAL | RE_USE_OGL_PIPELINE,
NULL, NULL, NULL, NULL, NULL, NULL, &EEVEE_collection_settings_create,
diff --git a/source/blender/draw/engines/eevee/eevee.h b/source/blender/draw/engines/eevee/eevee_engine.h
similarity index 83%
rename from source/blender/draw/engines/eevee/eevee.h
rename to source/blender/draw/engines/eevee/eevee_engine.h
index 8eca5b4d54c..0cbd89a79fa 100644
--- a/source/blender/draw/engines/eevee/eevee.h
+++ b/source/blender/draw/engines/eevee/eevee_engine.h
@@ -19,13 +19,13 @@
*
*/
-/** \file eevee.h
+/** \file eevee_engine.h
* \ingroup DNA
*/
-#ifndef __EEVEE_H__
-#define __EEVEE_H__
+#ifndef __EEVEE_ENGINE_H__
+#define __EEVEE_ENGINE_H__
-extern RenderEngineType viewport_eevee_type;
+extern RenderEngineType DRW_engine_viewport_eevee_type;
-#endif /* __EEVEE_H__ */
\ No newline at end of file
+#endif /* __EEVEE_ENGINE_H__ */
\ No newline at end of file
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index e2dd0c47cb4..0ce937b1304 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -25,7 +25,7 @@
#include "DRW_render.h"
-#include "eevee.h"
+#include "eevee_engine.h"
#include "eevee_private.h"
typedef struct EEVEE_LightData {
@@ -85,7 +85,7 @@ void EEVEE_lights_cache_add(EEVEE_StorageList *stl, Object *ob)
}
else {
Lamp *la = (Lamp *)ob->data;
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
DRW_lamp_engine_data_free((void *)led);
@@ -483,22 +483,22 @@ void EEVEE_lights_update(EEVEE_StorageList *stl)
int i;
for (i = 0; (ob = linfo->light_ref[i]) && (i < MAX_LIGHT); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
eevee_light_setup(ob, linfo, led);
}
for (i = 0; (ob = linfo->shadow_cube_ref[i]) && (i < MAX_SHADOW_CUBE); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
eevee_shadow_cube_setup(ob, linfo, led);
}
for (i = 0; (ob = linfo->shadow_map_ref[i]) && (i < MAX_SHADOW_MAP); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
eevee_shadow_map_setup(ob, linfo, led);
}
for (i = 0; (ob = linfo->shadow_cascade_ref[i]) && (i < MAX_SHADOW_CASCADE); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
eevee_shadow_cascade_setup(ob, linfo, led);
}
@@ -525,7 +525,7 @@ void EEVEE_draw_shadows(EEVEE_Data *vedata)
/* Render each shadow to one layer of the array */
for (i = 0; (ob = linfo->shadow_cube_ref[i]) && (i < MAX_SHADOW_CUBE); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
EEVEE_ShadowCubeData *evscd = (EEVEE_ShadowCubeData *)led->sto;
EEVEE_ShadowRender *srd = &linfo->shadow_render_data;
@@ -545,7 +545,7 @@ void EEVEE_draw_shadows(EEVEE_Data *vedata)
/* Render each shadow to one layer of the array */
for (i = 0; (ob = linfo->shadow_map_ref[i]) && (i < MAX_SHADOW_MAP); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
EEVEE_ShadowMapData *evsmd = (EEVEE_ShadowMapData *)led->sto;
linfo->layer = i;
@@ -560,7 +560,7 @@ void EEVEE_draw_shadows(EEVEE_Data *vedata)
/* Render each shadow to one layer of the array */
for (i = 0; (ob = linfo->shadow_cascade_ref[i]) && (i < MAX_SHADOW_CASCADE); i++) {
- EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &viewport_eevee_type);
+ EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)DRW_lamp_engine_data_get(ob, &DRW_engine_viewport_eevee_type);
EEVEE_ShadowCascadeData *evscd = (EEVEE_ShadowCascadeData *)led->sto;
EEVEE_ShadowRender *srd = &linfo->shadow_render_data;
diff --git a/source/blender/draw/engines/eevee/eevee_probes.c b/source/blender/draw/engines/eevee/eevee_probes.c
index cb83f43dc73..6d9c6ae15a4 100644
--- a/source/blender/draw/engines/eevee/eevee_probes.c
+++ b/source/blender/draw/engines/eevee/eevee_probes.c
@@ -29,7 +29,7 @@
#include "DRW_render.h"
-#include "eevee.h"
+#include "eevee_engine.h"
#include "eevee_private.h"
#include "GPU_texture.h"
#include "GPU_glew.h"
diff --git a/source/blender/draw/engines/select/select_engine.c b/source/blender/draw/engines/select/select_engine.c
index 4317ead3019..8d7b5856843 100644
--- a/source/blender/draw/engines/select/select_engine.c
+++ b/source/blender/draw/engines/select/select_engine.c
@@ -230,7 +230,7 @@ DrawEngineType draw_engine_select_type = {
&SELECT_draw_scene
};
-RenderEngineType viewport_select_type = {
+RenderEngineType DRW_engine_viewport_select_type = {
NULL, NULL,
SELECT_ENGINE, N_("SelectID"), RE_INTERNAL | RE_USE_OGL_PIPELINE,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
diff --git a/source/blender/draw/engines/select/select_engine.h b/source/blender/draw/engines/select/select_engine.h
index 2c647b1f121..653ada7e82f 100644
--- a/source/blender/draw/engines/select/select_engine.h
+++ b/source/blender/draw/engines/select/select_engine.h
@@ -26,6 +26,6 @@
#ifndef __SELECT_ENGINE_H__
#define __SELECT_ENGINE_H__
-extern RenderEngineType viewport_select_type;
+extern RenderEngineType DRW_engine_viewport_select_type;
#endif /* __SELECT_ENGINE_H__ */
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 997abbabd7e..ca21102551e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -68,9 +68,10 @@
#include "draw_cache_impl.h"
#include "draw_mode_engines.h"
-#include "clay.h"
-#include "eevee.h"
-#include "select_engine.h"
+
+#include "engines/clay/clay_engine.h"
+#include "engines/eevee/eevee_engine.h"
+#include "engines/select/select_engine.h"
#include
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list