Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcachetemp-eeveelightcache

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_lightprobes.c

8 files changed, 86 insertions, 85 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index 8be9c637fbc..2ec6f841409 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -132,9 +132,9 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 		/* determine the iteration count */
 		const float minDim = (float)MIN2(blitsize[0], blitsize[1]);
 		const float maxIter = (radius - 8.0f) + log(minDim) / log(2);
-		const int maxIterInt = effects->bloom_iteration_ct = (int)maxIter;
+		const int maxIterInt = effects->bloom_iteration_len = (int)maxIter;
 
-		CLAMP(effects->bloom_iteration_ct, 1, MAX_BLOOM_STEP);
+		CLAMP(effects->bloom_iteration_len, 1, MAX_BLOOM_STEP);
 
 		effects->bloom_sample_scale = 0.5f + maxIter - (float)maxIterInt;
 		effects->bloom_curve_threshold[0] = threshold - knee;
@@ -146,7 +146,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 
 		/* Downsample buffers */
 		copy_v2_v2_int(texsize, blitsize);
-		for (int i = 0; i < effects->bloom_iteration_ct; ++i) {
+		for (int i = 0; i < effects->bloom_iteration_len; ++i) {
 			texsize[0] /= 2; texsize[1] /= 2;
 
 			texsize[0] = MAX2(texsize[0], 2);
@@ -165,7 +165,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 
 		/* Upsample buffers */
 		copy_v2_v2_int(texsize, blitsize);
-		for (int i = 0; i < effects->bloom_iteration_ct - 1; ++i) {
+		for (int i = 0; i < effects->bloom_iteration_len - 1; ++i) {
 			texsize[0] /= 2; texsize[1] /= 2;
 
 			texsize[0] = MAX2(texsize[0], 2);
@@ -291,7 +291,7 @@ void EEVEE_bloom_draw(EEVEE_Data *vedata)
 
 		last = effects->bloom_downsample[0];
 
-		for (int i = 1; i < effects->bloom_iteration_ct; ++i) {
+		for (int i = 1; i < effects->bloom_iteration_len; ++i) {
 			copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i - 1]);
 			effects->unf_source_buffer = last;
 
@@ -303,7 +303,7 @@ void EEVEE_bloom_draw(EEVEE_Data *vedata)
 		}
 
 		/* Upsample and accumulate */
-		for (int i = effects->bloom_iteration_ct - 2; i >= 0; --i) {
+		for (int i = effects->bloom_iteration_len - 2; i >= 0; --i) {
 			copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i]);
 			effects->unf_source_buffer = effects->bloom_downsample[i];
 			effects->unf_base_buffer = last;
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index 60c6175f4fa..b9f7624552c 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -208,8 +208,8 @@ void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_
 		/* This create an empty batch of N triangles to be positioned
 		 * by the vertex shader 0.4ms against 6ms with instancing */
 		const float *viewport_size = DRW_viewport_size_get();
-		const int sprite_ct = ((int)viewport_size[0] / 2) * ((int)viewport_size[1] / 2); /* brackets matters */
-		grp = DRW_shgroup_empty_tri_batch_create(e_data.dof_scatter_sh, psl->dof_scatter, sprite_ct);
+		const int sprite_len = ((int)viewport_size[0] / 2) * ((int)viewport_size[1] / 2); /* brackets matters */
+		grp = DRW_shgroup_empty_tri_batch_create(e_data.dof_scatter_sh, psl->dof_scatter, sprite_len);
 
 		DRW_shgroup_uniform_texture_ref(grp, "nearBuffer", &effects->dof_down_near);
 		DRW_shgroup_uniform_texture_ref(grp, "farBuffer", &effects->dof_down_far);
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 6d68e609f03..adbe165354a 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -191,10 +191,10 @@ static void eevee_draw_background(void *vedata)
 
 	/* Number of iteration: needed for all temporal effect (SSR, volumetrics)
 	 * when using opengl render. */
-	int loop_ct = (DRW_state_is_image_render() &&
+	int loop_len = (DRW_state_is_image_render() &&
 	               (stl->effects->enabled_effects & (EFFECT_VOLUMETRIC | EFFECT_SSR)) != 0) ? 4 : 1;
 
-	while (loop_ct--) {
+	while (loop_len--) {
 		float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 		float clear_depth = 1.0f;
 		uint clear_stencil = 0xFF;
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 54bf59234b3..1cb9a957211 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -364,8 +364,8 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata,
 
 		DRWShadingGroup *grp = DRW_shgroup_create(e_data.probe_filter_glossy_sh, psl->probe_glossy_compute);
 		DRW_shgroup_uniform_float(grp, "intensityFac", &pinfo->intensity_fac, 1);
-		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_ct, 1);
-		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->invsamples_ct, 1);
+		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_len, 1);
+		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->samples_len_inv, 1);
 		DRW_shgroup_uniform_float(grp, "roughnessSquared", &pinfo->roughness, 1);
 		DRW_shgroup_uniform_float(grp, "lodFactor", &pinfo->lodfactor, 1);
 		DRW_shgroup_uniform_float(grp, "lodMax", &pinfo->lod_rt_max, 1);
@@ -385,8 +385,8 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata,
 #ifdef IRRADIANCE_SH_L2
 		DRW_shgroup_uniform_int(grp, "probeSize", &pinfo->shres, 1);
 #else
-		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_ct, 1);
-		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->invsamples_ct, 1);
+		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_len, 1);
+		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->samples_len_inv, 1);
 		DRW_shgroup_uniform_float(grp, "lodFactor", &pinfo->lodfactor, 1);
 		DRW_shgroup_uniform_float(grp, "lodMax", &pinfo->lod_rt_max, 1);
 		DRW_shgroup_uniform_texture(grp, "texHammersley", e_data.hammersley);
@@ -405,8 +405,8 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata,
 		DRW_shgroup_uniform_int(grp, "outputSize", &pinfo->shres, 1);
 		DRW_shgroup_uniform_float(grp, "visibilityRange", &pinfo->visibility_range, 1);
 		DRW_shgroup_uniform_float(grp, "visibilityBlur", &pinfo->visibility_blur, 1);
-		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_ct, 1);
-		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->invsamples_ct, 1);
+		DRW_shgroup_uniform_float(grp, "sampleCount", &pinfo->samples_len, 1);
+		DRW_shgroup_uniform_float(grp, "invSampleCount", &pinfo->samples_len_inv, 1);
 		DRW_shgroup_uniform_float(grp, "storedTexelSize", &pinfo->texel_size, 1);
 		DRW_shgroup_uniform_float(grp, "nearClip", &pinfo->near_clip, 1);
 		DRW_shgroup_uniform_float(grp, "farClip", &pinfo->far_clip, 1);
@@ -1111,18 +1111,18 @@ void EEVEE_lightbake_filter_glossy(
 
 #if 1 /* Variable Sample count (fast) */
 		switch (i) {
-			case 0: pinfo->samples_ct = 1.0f; break;
-			case 1: pinfo->samples_ct = 16.0f; break;
-			case 2: pinfo->samples_ct = 32.0f; break;
-			case 3: pinfo->samples_ct = 64.0f; break;
-			default: pinfo->samples_ct = 128.0f; break;
+			case 0: pinfo->samples_len = 1.0f; break;
+			case 1: pinfo->samples_len = 16.0f; break;
+			case 2: pinfo->samples_len = 32.0f; break;
+			case 3: pinfo->samples_len = 64.0f; break;
+			default: pinfo->samples_len = 128.0f; break;
 		}
 #else /* Constant Sample count (slow) */
-		pinfo->samples_ct = 1024.0f;
+		pinfo->samples_len = 1024.0f;
 #endif
 
-		pinfo->invsamples_ct = 1.0f / pinfo->samples_ct;
-		pinfo->lodfactor = bias + 0.5f * log((float)(target_size * target_size) * pinfo->invsamples_ct) / log(2);
+		pinfo->samples_len_inv = 1.0f / pinfo->samples_len;
+		pinfo->lodfactor = bias + 0.5f * log((float)(target_size * target_size) * pinfo->samples_len_inv) / log(2);
 
 		GPU_framebuffer_ensure_config(&fb, {
 			GPU_ATTACHMENT_NONE,
@@ -1157,10 +1157,10 @@ void EEVEE_lightbake_filter_diffuse(
 	int size[2] = {3, 3};
 #elif defined(IRRADIANCE_CUBEMAP)
 	int size[2] = {8, 8};
-	pinfo->samples_ct = 1024.0f;
+	pinfo->samples_len = 1024.0f;
 #elif defined(IRRADIANCE_HL2)
 	int size[2] = {3, 2};
-	pinfo->samples_ct = 1024.0f;
+	pinfo->samples_len = 1024.0f;
 #endif
 
 	int cell_per_row = GPU_texture_width(light_cache->grid_tx.tex) / size[0];
@@ -1170,8 +1170,8 @@ void EEVEE_lightbake_filter_diffuse(
 #ifndef IRRADIANCE_SH_L2
 	/* Tweaking parameters to balance perf. vs precision */
 	const float bias = 0.0f;
-	pinfo->invsamples_ct = 1.0f / pinfo->samples_ct;
-	pinfo->lodfactor = bias + 0.5f * log((float)(target_size * target_size) * pinfo->invsamples_ct) / log(2);
+	pinfo->samples_len_inv = 1.0f / pinfo->samples_len;
+	pinfo->lodfactor = bias + 0.5f * log((float)(target_size * target_size) * pinfo->samples_len_inv) / log(2);
 	pinfo->lod_rt_max = floorf(log2f(target_size)) - 2.0f;
 #else
 	pinfo->shres = 32; /* Less texture fetches & reduce branches */
@@ -1207,8 +1207,8 @@ void EEVEE_lightbake_filter_visibility(
 	EEVEE_LightProbesInfo *pinfo = sldata->probes;
 	LightCache *light_cache = vedata->stl->g_data->light_cache;
 
-	pinfo->samples_ct = 512.0f; /* TODO refine */
-	pinfo->invsamples_ct = 1.0f / pinfo->samples_ct;
+	pinfo->samples_len = 512.0f; /* TODO refine */
+	pinfo->samples_len_inv = 1.0f / pinfo->samples_len;
 	pinfo->shres = vis_size;
 	pinfo->visibility_range = vis_range;
 	pinfo->visibility_blur = vis_blur;
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index 1e11f224231..0f0d9d281c9 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -235,9 +235,9 @@ static GPUShader *eevee_lights_get_store_sh(int shadow_method, bool high_blur, b
 	return *shader;
 }
 
-static DRWPass *eevee_lights_cube_store_pass_get(EEVEE_PassList *psl, EEVEE_ViewLayerData *sldata, int shadow_method, int shadow_samples_ct)
+static DRWPass *eevee_lights_cube_store_pass_get(EEVEE_PassList *psl, EEVEE_ViewLayerData *sldata, int shadow_method, int shadow_samples_len)
 {
-	bool high_blur = shadow_samples_ct > 16;
+	bool high_blur = shadow_samples_len > 16;
 	DRWPass **pass = (high_blur) ? &psl->shadow_cube_store_pass : &psl->shadow_cube_store_high_pass;
 	if (*pass == NULL) {
 		EEVEE_LampsInfo *linfo = sldata->lamps;
@@ -252,9 +252,9 @@ static DRWPass *eevee_lights_cube_store_pass_get(EEVEE_PassList *psl, EEVEE_View
 	return *pass;
 }
 
-static DRWPass *eevee_lights_cascade_store_pass_get(EEVEE_PassList *psl, EEVEE_ViewLayerData *sldata, int shadow_method, int shadow_samples_ct)
+static DRWPass *eevee_lights_cascade_store_pass_get(EEVEE_PassList *psl, EEVEE_ViewLayerData *sldata, int shadow_method, int shadow_samples_len)
 {
-	bool high_blur = shadow_samples_ct > 16;
+	bool high_blur = shadow_samples_len > 16;
 	DRWPass **pass = (high_blur) ? &psl->shadow_cascade_store_pass : &psl->shadow_cascade_store_high_pass;
 	if (*pass == NULL) {
 		EEVEE_LampsInfo *linfo = sldata->lamps;
@@ -280,8 +280,8 @@ void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	linfo->num_light = 0;
 	linfo->num_cube_layer = 0;
 	linfo->num_cascade_layer = 0;
-	linfo->gpu_cube_ct = linfo->gpu_cascade_ct = linfo->gpu_shadow_ct = 0;
-	linfo->cpu_cube_ct = linfo->cpu_cascade_ct = 0;
+	linfo->gpu_cube_len = linfo->gpu_cascade_len = linfo->gpu_shadow_len = 0;
+	linfo->cpu_cube_len = linfo->cpu_cascade_len = 0;
 	memset(linfo->light_ref, 0, sizeof(linfo->light_ref));
 	memset(linfo->shadow_cube_ref, 0, sizeof(linfo->shadow_cube_ref));
 	memset(linfo->shadow_cascade_ref, 0, sizeof(linfo->shadow_cascade_ref));
@@ -334,7 +334,7 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob)
 
 	/* Step 1 find all lamps in the scene and setup them */
 	if (linfo->num_light >= MAX_LIGHT) {
-		printf("Too many lamps in the scene !!!\n");
+		printf("Too many lights in the scene !!!\n");
 	}
 	else {
 		Lamp *la = (Lamp *)ob->data;
@@ -361,56 +361,56 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob)
 				int sh_nbr = 1; /* TODO : MSM */
 				int cascade_nbr = la->cascade_count;
 
-				if ((linfo->gpu_cascade_ct + sh_nbr) <= MAX_SHADOW_CASCADE) {
+				if ((linfo->gpu_cascade_len + sh_nbr) <= MAX_SHADOW_CASCADE) {
 					/* Save Light object. */
-					linfo->shadow_cascade_ref[linfo->cpu_cascade_ct] = ob;
+					linfo->shadow_cascade_ref[linfo->cpu_cascade_len] = ob;
 
 					/* Store indices. */
 					EEVEE_ShadowCascadeData *data = &led->data.scad;
-					data->shadow_id = linfo->gpu_shadow_ct;
-					data->cascade_id = linfo->gpu_cascade_ct;
+					data->shadow_id = linfo->gpu_shadow_len;
+					data->cascade_id = linfo->gpu_cascade_len;
 					data->layer_id = linfo->num_cascade_layer;
 
 					/* Increment indices. */
-					linfo->gpu_shadow_ct += 1;
-					linfo->gpu_cascade_ct += sh_nbr;
+					linfo->gpu_shadow_len += 1;
+					linfo->gpu_cascade_len += sh_nbr;
 					linfo->num_cascade_layer += sh_nbr * cascade_nbr;
 
-					linfo->cpu_cascade_ct += 1;
+					linfo->cpu_cascade_len += 1;
 				}
 			}
 			else if (la->type == LA_SPOT || la->type == LA_LOCAL || la->type == LA_AREA) {
 				int sh_nbr = 1; /* TODO : MSM */
 
-				if ((linfo->gpu_cube_ct + sh_nbr) <= MAX_SHADOW_CUBE) {
+				if ((linfo->gpu_cube_len + sh_nbr) <= MAX_SHADOW_CUBE) {
 					/* Save Light object. */
-					linfo->shadow_cube_ref[linfo->cpu_cube_ct] = ob;
+					linfo->shadow_cube_ref[linfo->cpu_cube_len] = ob;
 
 					/* For light update tracking. */
 					if ((prev_cube_sh_id >= 0) &&
 					    (prev_cube_sh_id < linfo->shcaster_backbuffer->count))
 					{
-						linfo->new_shadow_id[prev_cube_sh_id] = linfo->cpu_cube_ct;
+						linfo->new_shadow_id[prev_cube_sh_id] = linfo->cpu_cube_len;
 					}
-					led->prev_cube_shadow_id = linfo->cpu_cube_ct;
+					led->prev_cube_shadow_id = linfo->cpu_cube_len;
 
 					/* Saving lamp bounds for later. */
-					BLI_assert(linfo->cpu_cube_ct >= 0 && linfo->cpu_cube_ct < MAX_LIGHT);
-					copy_v3_v3(linfo->shadow_bounds[linfo->cpu_cube_ct].center, ob->obmat[3]);
-					linfo->shadow_bounds[linfo->cpu_cube_ct].radius = la->clipend;
+					BLI_assert(linfo->cpu_cube_len >= 0 && linfo->cpu_cube_len < MAX_LIGHT);
+					copy_v3_v3(linfo->shadow_bounds[linfo->cpu_cube_len].center, ob->obmat[3]);
+					linfo->shadow_bounds[linfo->cpu_cube_len].radius = la->clipend;
 
 					EEVEE_ShadowCubeData *data = &led->data.scd;
 					/* Store indices. */
-					data->shadow_id = linfo->gpu_shadow_ct;
-					data->cube_id = linfo->gpu_cube_ct;
+					data->shadow_id = linfo->gpu_shadow_len;
+					data->cube_id = linfo->gpu_cube_len;
 					data->layer_id = linfo->num_cube_layer;
 
 					/* Increment indices. */
-					linfo->gpu_shadow_ct += 1;
-					linfo->gpu_cube_ct += sh_nbr;
+					linfo->gpu_shadow_len += 1;
+					linfo->gpu_cube_len += sh_nbr;
 					linfo->num_cube_layer += sh_nbr;
 
-					linfo->cpu_cube_ct += 1;
+					linfo->cpu_cube_len += 1;
 				}
 			}
 		}
@@ -993,7 +993,7 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata)
 	for (i = 0; i < frontbuffer->count; i++, flag++, shcaster++) {
 		/* Run intersection checks to fill the bitfields. */
 		bsphere = linfo->shadow_bounds;
-		for (int j = 0; j < linfo->cpu_cube_ct; j++, bsphere++) {
+		for (int j = 0; j < linfo->cpu_cube_len; j++, bsphere++) {
 			bool iter = sphere_bbox_intersect(bsphere, &shcaster->bbox);
 			lightbits_set_single(&shcaster->bits, j, iter);
 		}
@@ -1139,19 +1139,19 @@ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl)
 			filter_pixel_size = max_ff(0.0f, filter_pixel_size - 3.0f);
 			/* Compute number of concentric samples. Depends directly on filter size. */
 			float pix_size_sqr = filter_pixel_size * filter_pixel_size;
-			srd->shadow_samples_ct = min_ii(max_sample, 4 + 8 * (int)filter_pixel_size + 4 * (int)(pix_size_sqr));
+			srd->shadow_samples_len = min_ii(max_sample, 4 + 8 * (int)filter_pixel_size + 4 * (int)(pix_size_sqr));
 		}
 		else {
 			linfo->filter_size = 0.0f;
-			srd->shadow_samples_ct = 4;
+			srd->shadow_samples_len = 4;
 		}
-		srd->shadow_inv_samples_ct = 1.0f / (float)srd->shadow_samples_ct;
+		srd->shadow_samples_len_inv = 1.0f / (float)srd->shadow_samples_len;
 		DRW_uniformbuffer_update(sldata->shadow_render_ubo, srd);
 
 		GPU_framebuffer_texture_layer_attach(sldata->shadow_cube_store_fb, sldata->shadow_cube_pool, 0, evscd->layer_id, 0);
 		GPU_framebuffer_bind(sldata->shadow_cube_store_fb);
 
-		DRWPass *store_pass = eevee_lights_cube_store_pass_get(psl, sldata, linfo->shadow_method, srd->shadow_samples_ct);
+		DRWPass *store_pass = eevee_lights_cube_store_pass_get(psl, sldata, linfo->shadow_method, srd->shadow_samples_len);
 		DRW_draw_pass(store_pass);
 
 		led->need_update = false;
@@ -1240,20 +1240,20 @@ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_PassList *psl)
 				filter_pixel_size = max_ff(0.0f, filter_pixel_size - 3.0f);
 				/* Compute number of concentric samples. Depends directly on filter size. */
 				float pix_size_sqr = filter_pixel_size * filter_pixel_size;
-				srd->shadow_samples_ct = min_ii(max_sample, 4 + 8 * (int)filter_pixel_size + 4 * (int)(pix_size_sqr));
+				srd->shadow_samples_len = min_ii(max_sample, 4 + 8 * (int)filter_pixel_size + 4 * (int)(pix_size_sqr));
 			}
 			else {
 				linfo->filter_size = 0.0f;
-				srd->shadow_samples_ct = 4;
+				srd->shadow_samples_len = 4;
 			}
-			srd->shadow_inv_samples_ct = 1.0f / (float)srd->shadow_samples_ct;
+			srd->shadow_samples_len_inv = 1.0f / (float)srd->shadow_samples_len;
 			DRW_uniformbuffer_update(sldata->shadow_render_ubo, &linfo->shadow_render_data);
 
 			int layer = evscd->layer_id + linfo->current_shadow_cascade;
 			GPU_framebuffer_texture_layer_attach(sldata->shadow_cascade_store_fb, sldata->shadow_cascade_pool, 0, layer, 0);
 			GPU_framebuffer_bind(sldata->shadow_cascade_store_fb);
 
-			DRWPass *store_pass = eevee_lights_cascade_store_pass_get(psl, sldata, linfo->shadow_method, srd->shadow_samples_ct);
+			DRWPass *store_pass = eevee_lights_cascade_store_pass_get(psl, sldata, linfo->shadow_method, srd->shadow_samples_len);
 			DRW_draw_pass(store_pass);
 		}
 	}
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index 4c403b93f3e..2e568d97c07 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -57,9 +57,9 @@ void EEVEE_lookdev_cache_init(
 	EEVEE_TextureList *txl = vedata->txl;
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	View3D *v3d = draw_ctx->v3d;
-	if (LOOK_DEV_MODE_ENABLED(v3d)) {
-		StudioLight *sl = BKE_studiolight_find(v3d->shading.studio_light, STUDIOLIGHT_INTERNAL | STUDIOLIGHT_ORIENTATION_WORLD);
-		if ((sl->flag & STUDIOLIGHT_ORIENTATION_WORLD)) {
+	if (LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d)) {
+		StudioLight *sl = BKE_studiolight_find(v3d->shading.studio_light, STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE);
+		if (sl && (sl->flag & STUDIOLIGHT_ORIENTATION_WORLD)) {
 			struct Gwn_Batch *geom = DRW_cache_fullscreen_quad_get();
 			GPUTexture *tex = NULL;
 
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index fba377cbcaf..20d755d2245 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -115,8 +115,8 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h))
 {
 	struct GPUTexture *tex;
 	struct GPUFrameBuffer *fb = NULL;
-	static float samples_ct = 8192.0f;
-	static float inv_samples_ct = 1.0f / 8192.0f;
+	static float samples_len = 8192.0f;
+	static float inv_samples_len = 1.0f / 8192.0f;
 
 	char *lib_str = BLI_string_joinN(
 	        datatoc_bsdf_common_lib_glsl,
@@ -130,8 +130,8 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h))
 
 	DRWPass *pass = DRW_pass_create("LightProbe Filtering", DRW_STATE_WRITE_COLOR);
 	DRWShadingGroup *grp = DRW_shgroup_create(sh, pass);
-	DRW_shgroup_uniform_float(grp, "sampleCount", &samples_ct, 1);
-	DRW_shgroup_uniform_float(grp, "invSampleCount", &inv_samples_ct, 1);
+	DRW_shgroup_uniform_float(grp, "sampleCount", &samples_len, 1);
+	DRW_shgroup_uniform_float(grp, "invSampleCount", &inv_samples_len, 1);
 	DRW_shgroup_uniform_texture(grp, "texHammersley", e_data.hammersley);
 	DRW_shgroup_uniform_texture(grp, "texJitter", e_data.jitter);
 
@@ -172,9 +172,9 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
 	struct GPUTexture *tex;
 	struct GPUTexture *hammersley = create_hammersley_sample_texture(8192);
 	struct GPUFrameBuffer *fb = NULL;
-	static float samples_ct = 8192.0f;
+	static float samples_len = 8192.0f;
 	static float a2 = 0.0f;
-	static float inv_samples_ct = 1.0f / 8192.0f;
+	static float inv_samples_len = 1.0f / 8192.0f;
 
 	char *frag_str = BLI_string_joinN(
 	        datatoc_bsdf_common_lib_glsl,
@@ -192,8 +192,8 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
 	DRWPass *pass = DRW_pass_create("LightProbe Filtering", DRW_STATE_WRITE_COLOR);
 	DRWShadingGroup *grp = DRW_shgroup_create(sh, pass);
 	DRW_shgroup_uniform_float(grp, "a2", &a2, 1);
-	DRW_shgroup_uniform_float(grp, "sampleCount", &samples_ct, 1);
-	DRW_shgroup_uniform_float(grp, "invSampleCount", &inv_samples_ct, 1);
+	DRW_shgroup_uniform_float(grp, "sampleCount", &samples_len, 1);
+	DRW_shgroup_uniform_float(grp, "invSampleCount", &inv_samples_len, 1);
 	DRW_shgroup_uniform_texture(grp, "texHammersley", hammersley);
 	DRW_shgroup_uniform_texture(grp, "utilTex", e_data.util_tex);
 
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index c9149d3bcf8..e2a875dca1f 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -98,7 +98,8 @@ extern struct DrawEngineType draw_engine_eevee_type;
 #define OVERLAY_ENABLED(v3d) ((v3d) && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
 #define LOOK_DEV_MODE_ENABLED(v3d) ((v3d) && (v3d->drawtype == OB_MATERIAL))
 #define LOOK_DEV_OVERLAY_ENABLED(v3d) (LOOK_DEV_MODE_ENABLED(v3d) && OVERLAY_ENABLED(v3d) && (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV))
-#define USE_SCENE_LIGHT(v3d) ((!v3d) || (!LOOK_DEV_MODE_ENABLED(v3d)) || ((LOOK_DEV_MODE_ENABLED(v3d) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHT))))
+#define USE_SCENE_LIGHT(v3d) ((!v3d) || (!LOOK_DEV_MODE_ENABLED(v3d)) || ((LOOK_DEV_MODE_ENABLED(v3d) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHTS))))
+#define LOOK_DEV_STUDIO_LIGHT_ENABLED(v3d) (LOOK_DEV_MODE_ENABLED(v3d) && !(v3d->shading.flag & V3D_SHADING_SCENE_WORLD))
 
 #define OCTAHEDRAL_SIZE_FROM_CUBESIZE(cube_size) ((int)ceilf(sqrtf((cube_size * cube_size) * 6.0f)))
 #define MIN_CUBE_LOD_LEVEL 3
@@ -359,14 +360,14 @@ typedef struct EEVEE_ShadowRender {
 	float stored_texel_size;
 	float clip_near;
 	float clip_far;
-	int shadow_samples_ct;
-	float shadow_inv_samples_ct;
+	int shadow_samples_len;
+	float shadow_samples_len_inv;
 } EEVEE_ShadowRender;
 
 /* This is just a really long bitflag with special function to access it. */
 #define MAX_LIGHTBITS_FIELDS (MAX_LIGHT / 8)
 typedef struct EEVEE_LightBits {
-	unsigned char fields[MAX_LIGHTBITS_FIELDS];
+	uchar fields[MAX_LIGHTBITS_FIELDS];
 } EEVEE_LightBits;
 
 typedef struct EEVEE_ShadowCaster {
@@ -386,8 +387,8 @@ typedef struct EEVEE_LampsInfo {
 	int num_light, cache_num_light;
 	int num_cube_layer, cache_num_cube_layer;
 	int num_cascade_layer, cache_num_cascade_layer;
-	int gpu_cube_ct, gpu_cascade_ct, gpu_shadow_ct;
-	int cpu_cube_ct, cpu_cascade_ct;
+	int gpu_cube_len, gpu_cascade_len, gpu_shadow_len;
+	int cpu_cube_len, cpu_cascade_len;
 	int update_flag;
 	int shadow_cube_size, shadow_cascade_size, shadow_method;
 	bool shadow_high_bitdepth;
@@ -451,8 +452,8 @@ typedef struct EEVEE_LightProbesInfo {
 	int layer;
 	float texel_size;
 	float padding_size;
-	float samples_ct;
-	float invsamples_ct;
+	float samples_len;
+	float samples_len_inv;
 	float near_clip;
 	float far_clip;
 	float roughness;
@@ -558,7 +559,7 @@ typedef struct EEVEE_EffectsInfo {
 	/* Other */
 	float prev_persmat[4][4];
 	/* Bloom */
-	int bloom_iteration_ct;
+	int bloom_iteration_len;
 	float source_texel_size[2];
 	float blit_texel_size[2];
 	float downsamp_texel_size[MAX_BLOOM_STEP][2];