[Bf-blender-cvs] [c6ce820] master: Attempt to fix T44056, dof high quality shader error in ATI cards.
Antony Riakiotakis
noreply at git.blender.org
Mon Mar 30 14:45:24 CEST 2015
Commit: c6ce8200dd3f3b67029cfd5578f21d206cff219e
Author: Antony Riakiotakis
Date: Mon Mar 30 14:44:31 2015 +0200
Branches: master
https://developer.blender.org/rBc6ce8200dd3f3b67029cfd5578f21d206cff219e
Attempt to fix T44056, dof high quality shader error in ATI cards.
ATI driver does not like declaration of gl_FragColor and glFragData in
the same source file (even though only one of the two is ever
referenced), just use one of the two.
===================================================================
M source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
index 8c2aff4..e315d2f 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
@@ -107,7 +107,7 @@ void accumulate_pass(void) {
if (dot(particlecoord, particlecoord) > r * r)
discard;
- gl_FragColor = color;
+ gl_FragData[0] = color;
}
#define MERGE_THRESHOLD 4.0
@@ -151,7 +151,7 @@ void final_pass(void) {
finalcolor = mix(finalcolor, nearcolor, nearweight / totalweight);
}
- gl_FragColor = finalcolor;
+ gl_FragData[0] = finalcolor;
}
void main()
More information about the Bf-blender-cvs
mailing list