[Bf-blender-cvs] [6c15f30] master: Yet another attempt to fix Intel case for T43987

Antony Riakiotakis noreply at git.blender.org
Sat May 16 23:09:31 CEST 2015


Commit: 6c15f3044be138d025b2ae5d6be56103a65b4fa0
Author: Antony Riakiotakis
Date:   Sat May 16 23:08:40 2015 +0200
Branches: master
https://developer.blender.org/rB6c15f3044be138d025b2ae5d6be56103a65b4fa0

Yet another attempt to fix Intel case for T43987

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

M	source/blender/gpu/intern/gpu_extensions.c

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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index c017856..976a65a 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -263,11 +263,20 @@ void gpu_extensions_init(void)
 		GG.dfdyfactors[0] = 1.0;
 		GG.dfdyfactors[1] = -1.0;
 	}
-	else if (GG.device == GPU_DEVICE_INTEL && GG.os == GPU_OS_WIN &&
-	         (strstr(version, "4.0.0 - Build 9.18.10.3165") ||
-	          strstr(version, "3.1.0 - Build 9.17.10.4101"))) {
-		GG.dfdyfactors[0] = -1.0;
-		GG.dfdyfactors[1] = 1.0;
+	else if (GG.device == GPU_DEVICE_INTEL && GG.os == GPU_OS_WIN) {
+		if (strstr(version, "4.0.0 - Build 9.18.10.3165"))
+		{
+			GG.dfdyfactors[0] = -1.0;
+			GG.dfdyfactors[1] = 1.0;
+		}
+		else if (strstr(version, "3.1.0 - Build 9.17.10.4101")) {
+			GG.dfdyfactors[0] = -1.0;
+			GG.dfdyfactors[1] = -1.0;
+		}
+		else {
+			GG.dfdyfactors[0] = 1.0;
+			GG.dfdyfactors[1] = 1.0;
+		}
 	}
 	else {
 		GG.dfdyfactors[0] = 1.0;




More information about the Bf-blender-cvs mailing list