[Bf-blender-cvs] [a498d88] master: Attempt to mitigate issue T40981

[Antony Riakiotakis]

Commit: a498d889188420eb5f02c7e6cfe81ce9b0bf692e
Author: Antony Riakiotakis
Date:   Wed Jul 9 21:24:37 2014 +0300
https://developer.blender.org/rBa498d889188420eb5f02c7e6cfe81ce9b0bf692e

Attempt to mitigate issue T40981

Clipping border causes a software fallback on ATIs. We have disabled it
in that case but from minor digging on the net seems like Intels support
this, so enable.

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

M	source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_vertex.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl b/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
index 9491eaa..830dbec 100644
--- a/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
@@ -29,7 +29,7 @@ void main()
 
 	gl_Position = gl_ProjectionMatrix * co;
 
-#ifdef GPU_NVIDIA 
+#ifndef GPU_ATI
 	// Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA
 	// graphic cards, while on ATI it can cause a software fallback.
 	gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex; 
diff --git a/source/blender/gpu/shaders/gpu_shader_vertex.glsl b/source/blender/gpu/shaders/gpu_shader_vertex.glsl
index 8741a13..159e531 100644
--- a/source/blender/gpu/shaders/gpu_shader_vertex.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_vertex.glsl
@@ -10,7 +10,7 @@ void main()
 	varnormal = normalize(gl_NormalMatrix * gl_Normal);
 	gl_Position = gl_ProjectionMatrix * co;
 
-#ifdef GPU_NVIDIA
+#ifndef GPU_ATI
 	// Setting gl_ClipVertex is necessary to get glClipPlane working on NVIDIA
 	// graphic cards, while on ATI it can cause a software fallback.
 	gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;