diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-06-02 22:08:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-06-02 22:08:41 -0300 |
| commit | 8a1097a2243a9829d5d7e61ef10133f8096aa5e2 (patch) | |
| tree | 2ec55a650b676975e6ef2ed60e25d68307381269 /drivers | |
| parent | e79d7149ea751e32312cb8625548085d4537c591 (diff) | |
many fixes to image loader, voxel cone tracing, etc.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/shaders/ssao_blur.glsl | 2 | ||||
| -rw-r--r-- | drivers/png/image_loader_png.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gles3/shaders/ssao_blur.glsl b/drivers/gles3/shaders/ssao_blur.glsl index ff852487c0..ce4154f50c 100644 --- a/drivers/gles3/shaders/ssao_blur.glsl +++ b/drivers/gles3/shaders/ssao_blur.glsl @@ -24,7 +24,7 @@ layout(location = 0) out float visibility; // Tunable Parameters: /** Increase to make depth edges crisper. Decrease to reduce flicker. */ -#define EDGE_SHARPNESS (1.0) +#define EDGE_SHARPNESS (4.0) /** Step in 2-pixel intervals since we already blurred against neighbors in the first AO pass. This constant can be increased while R decreases to improve diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 25ab767bed..33d271248c 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -256,6 +256,7 @@ static Ref<Image> _load_mem_png(const uint8_t *p_png, int p_size) { static Ref<Image> _lossless_unpack_png(const PoolVector<uint8_t> &p_data) { int len = p_data.size(); + ERR_FAIL_COND_V(len < 4, Ref<Image>()); PoolVector<uint8_t>::Read r = p_data.read(); ERR_FAIL_COND_V(r[0] != 'P' || r[1] != 'N' || r[2] != 'G' || r[3] != ' ', Ref<Image>()); return _load_mem_png(&r[4], len - 4); |