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:
authorAntony Riakiotakis <kalast@gmail.com>2014-07-09 22:24:37 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-07-09 22:24:37 +0400
commita498d889188420eb5f02c7e6cfe81ce9b0bf692e (patch)
tree7ba6aafe61e669995c2358135fd212ca4f889c9e /source/blender/gpu/shaders
parentf5caab2cf7f19c79f57ac0e3c2900943ac06af45 (diff)
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.
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_simple_vert.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_vertex.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl b/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
index 9491eaa672d..830dbec75e2 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 8741a13ea9b..159e531eb44 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;