[Bf-blender-cvs] [0c49d83b495] blender2.8: Eevee: Use named EEVEE_EffectsFlag for effects flag.

Clément Foucault noreply at git.blender.org
Mon Mar 26 10:03:06 CEST 2018


Commit: 0c49d83b495f66c749fc9158e0b2eb9356b1075f
Author: Clément Foucault
Date:   Mon Mar 26 10:02:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0c49d83b495f66c749fc9158e0b2eb9356b1075f

Eevee: Use named EEVEE_EffectsFlag for effects flag.

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

M	source/blender/draw/engines/eevee/eevee_private.h

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

diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index b000cad6601..bf77914832e 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -468,8 +468,24 @@ enum {
 };
 
 /* ************ EFFECTS DATA ************* */
+
+typedef enum EEVEE_EffectsFlag {
+	EFFECT_MOTION_BLUR         = (1 << 0),
+	EFFECT_BLOOM               = (1 << 1),
+	EFFECT_DOF                 = (1 << 2),
+	EFFECT_VOLUMETRIC          = (1 << 3),
+	EFFECT_SSR                 = (1 << 4),
+	EFFECT_DOUBLE_BUFFER       = (1 << 5), /* Not really an effect but a feature */
+	EFFECT_REFRACT             = (1 << 6),
+	EFFECT_GTAO                = (1 << 7),
+	EFFECT_TAA                 = (1 << 8),
+	EFFECT_POST_BUFFER         = (1 << 9), /* Not really an effect but a feature */
+	EFFECT_NORMAL_BUFFER       = (1 << 10), /* Not really an effect but a feature */
+	EFFECT_SSS                 = (1 << 11),
+} EEVEE_EffectsFlag;
+
 typedef struct EEVEE_EffectsInfo {
-	int enabled_effects;
+	EEVEE_EffectsFlag enabled_effects;
 	bool swap_double_buffer;
 	/* SSSS */
 	int sss_sample_count;
@@ -543,21 +559,6 @@ typedef struct EEVEE_EffectsInfo {
 	struct GPUFrameBuffer *final_fb;        /* Framebuffer with final_tx as attachement. */
 } EEVEE_EffectsInfo;
 
-enum {
-	EFFECT_MOTION_BLUR         = (1 << 0),
-	EFFECT_BLOOM               = (1 << 1),
-	EFFECT_DOF                 = (1 << 2),
-	EFFECT_VOLUMETRIC          = (1 << 3),
-	EFFECT_SSR                 = (1 << 4),
-	EFFECT_DOUBLE_BUFFER       = (1 << 5), /* Not really an effect but a feature */
-	EFFECT_REFRACT             = (1 << 6),
-	EFFECT_GTAO                = (1 << 7),
-	EFFECT_TAA                 = (1 << 8),
-	EFFECT_POST_BUFFER         = (1 << 9), /* Not really an effect but a feature */
-	EFFECT_NORMAL_BUFFER       = (1 << 10), /* Not really an effect but a feature */
-	EFFECT_SSS                 = (1 << 11),
-};
-
 /* ***************** COMMON DATA **************** */
 
 /* Common uniform buffer containing all "constant" data over the whole drawing pipeline. */



More information about the Bf-blender-cvs mailing list