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>2019-09-06 20:02:15 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-09-06 20:02:15 +0300
commitd83734aa4bad9d5a9fa17dc46f29323a5a679d7c (patch)
tree00eec7c1462efe889fc5a72041df829ce233c1e7 /source/blender/gpu/intern/gpu_extensions.c
parent073624d4cccdae8c42a7d44c732dbcb43bb4cfa6 (diff)
EEVEE: Fix bump mapping
Fix issue in latest patch and assure derivatives calculation is correct on all GPU.
Diffstat (limited to 'source/blender/gpu/intern/gpu_extensions.c')
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 5839b34cd19..0d8e246a2b4 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -369,6 +369,9 @@ void gpu_extensions_init(void)
}
/* df/dy calculation factors, those are dependent on driver */
+ GG.dfdyfactors[0] = 1.0;
+ GG.dfdyfactors[1] = 1.0;
+
if ((strstr(vendor, "ATI") && strstr(version, "3.3.10750"))) {
GG.dfdyfactors[0] = 1.0;
GG.dfdyfactors[1] = -1.0;
@@ -383,10 +386,6 @@ void gpu_extensions_init(void)
GG.dfdyfactors[0] = -1.0;
GG.dfdyfactors[1] = 1.0;
}
- else {
- GG.dfdyfactors[0] = 1.0;
- GG.dfdyfactors[1] = 1.0;
- }
if (strstr(version, "Build 10.18.10.3") || strstr(version, "Build 10.18.10.4") ||
strstr(version, "Build 10.18.14.4") || strstr(version, "Build 10.18.14.5")) {