Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2021-09-29 11:14:21 +0300
committerClément Foucault <foucault.clem@gmail.com>2021-09-29 12:14:34 +0300
commitab6a6ffed4961df29431572c92e19c331aa2dffb (patch)
treecdd0ffa15ac650947b355d257a0b3c4acfb9fe96
parentd3a825678a447c4b3798081b204ce19d13f0d55e (diff)
Cleanup: Remove compiler warnings
-rw-r--r--source/blender/draw/engines/eevee/eevee_film.hh6
-rw-r--r--source/blender/draw/engines/eevee/eevee_light.hh2
-rw-r--r--source/blender/draw/engines/eevee/eevee_lightcache.cc2
-rw-r--r--source/blender/draw/engines/eevee/eevee_motion_blur.hh1
-rw-r--r--source/blender/draw/engines/eevee/eevee_sampling.hh1
-rw-r--r--source/blender/draw/engines/eevee/eevee_shading.hh13
6 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_film.hh b/source/blender/draw/engines/eevee/eevee_film.hh
index 49345a98619..06e019e5a3a 100644
--- a/source/blender/draw/engines/eevee/eevee_film.hh
+++ b/source/blender/draw/engines/eevee/eevee_film.hh
@@ -58,16 +58,16 @@ class Film {
/** Reference to first_sample_tx_ or data_tx_ depending on the context. */
GPUTexture *first_sample_ref_;
- DRWPass *clear_ps_ = nullptr;
+ // DRWPass *clear_ps_ = nullptr;
DRWPass *accumulate_ps_ = nullptr;
DRWPass *resolve_ps_ = nullptr;
/** Shader parameter, not allocated. */
GPUTexture *input_tx_;
/** ViewProjection matrix used to render the input. */
- float src_persmat_[4][4];
+ // float src_persmat_[4][4];
/** ViewProjection matrix Inverse used to render the input. */
- float src_persinv_[4][4];
+ // float src_persinv_[4][4];
StructBuffer<FilmData> data_;
diff --git a/source/blender/draw/engines/eevee/eevee_light.hh b/source/blender/draw/engines/eevee/eevee_light.hh
index f597002983a..ba1726a92d7 100644
--- a/source/blender/draw/engines/eevee/eevee_light.hh
+++ b/source/blender/draw/engines/eevee/eevee_light.hh
@@ -119,7 +119,7 @@ class LightModule {
const GPUUniformBuf *active_culling_ubo_;
GPUTexture *active_culling_tx_;
- uint64_t active_batch_count_;
+ // uint64_t active_batch_count_;
float light_threshold_;
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc
index 58049729dcf..c778c07f098 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc
@@ -424,7 +424,7 @@ void LightCache::update_info(SceneEEVEE *eevee)
BLI_snprintf(eevee->light_cache_info,
sizeof(eevee->light_cache_info),
- TIP_("%d Ref. Cubemaps, %ld Irr. Samples (%s in memory)"),
+ TIP_("%d Ref. Cubemaps, %lld Irr. Samples (%s in memory)"),
lcache->cube_len - 1,
lcache->irradiance_sample_count(),
formatted_mem);
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.hh b/source/blender/draw/engines/eevee/eevee_motion_blur.hh
index 8aa9fd2eaf6..5dab68fba5d 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.hh
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.hh
@@ -85,7 +85,6 @@ class MotionBlurModule {
/** Copy of scene settings. */
int motion_blur_position_;
float motion_blur_shutter_;
- float motion_blur_fx_depth_scale_;
bool enabled_ = false;
float motion_blur_fx_enabled_ = false;
diff --git a/source/blender/draw/engines/eevee/eevee_sampling.hh b/source/blender/draw/engines/eevee/eevee_sampling.hh
index 2ccf5b0dd9c..2a43ff1f69d 100644
--- a/source/blender/draw/engines/eevee/eevee_sampling.hh
+++ b/source/blender/draw/engines/eevee/eevee_sampling.hh
@@ -59,7 +59,6 @@ class Sampling {
uint64_t motion_blur_steps_ = 1;
/** Used for viewport smooth transition. */
int64_t sample_viewport_ = 1;
- int64_t sample_count_viewport_ = 64;
int64_t viewport_smoothing_start = 0;
int64_t viewport_smoothing_duration = 0;
/** Tag to reset sampling for the next sample. */
diff --git a/source/blender/draw/engines/eevee/eevee_shading.hh b/source/blender/draw/engines/eevee/eevee_shading.hh
index 7258b0c899b..1a23e24d6af 100644
--- a/source/blender/draw/engines/eevee/eevee_shading.hh
+++ b/source/blender/draw/engines/eevee/eevee_shading.hh
@@ -271,9 +271,10 @@ class DeferredLayer {
private:
Instance &inst_;
- GPUTexture *input_emission_data_tx_ = nullptr;
- GPUTexture *input_diffuse_data_tx_ = nullptr;
- GPUTexture *input_depth_tx_ = nullptr;
+ /* TODO */
+ // GPUTexture *input_emission_data_tx_ = nullptr;
+ // GPUTexture *input_diffuse_data_tx_ = nullptr;
+ // GPUTexture *input_depth_tx_ = nullptr;
DRWPass *prepass_ps_ = nullptr;
DRWPass *prepass_culled_ps_ = nullptr;
@@ -306,7 +307,7 @@ class DeferredPass {
DRWPass *eval_diffuse_ps_ = nullptr;
DRWPass *eval_transparency_ps_ = nullptr;
DRWPass *eval_holdout_ps_ = nullptr;
- DRWPass *eval_volume_heterogeneous_ps_ = nullptr;
+ // DRWPass *eval_volume_heterogeneous_ps_ = nullptr;
DRWPass *eval_volume_homogeneous_ps_ = nullptr;
/* References only. */
@@ -321,8 +322,8 @@ class DeferredPass {
GPUTexture *input_reflect_normal_tx_ = nullptr;
GPUTexture *input_transparency_data_tx_ = nullptr;
GPUTexture *input_volume_data_tx_ = nullptr;
- GPUTexture *input_volume_radiance_tx_ = nullptr;
- GPUTexture *input_volume_transmittance_tx_ = nullptr;
+ // GPUTexture *input_volume_radiance_tx_ = nullptr;
+ // GPUTexture *input_volume_transmittance_tx_ = nullptr;
public:
DeferredPass(Instance &inst)