[Bf-blender-cvs] [10edaff] master: Fix ATI part of T45708, crash when enabling opensubdiv.

Antony Riakiotakis noreply at git.blender.org
Thu Aug 20 15:23:42 CEST 2015


Commit: 10edaff5c1a18ca7e91743b3244a6007363b592c
Author: Antony Riakiotakis
Date:   Thu Aug 20 16:23:33 2015 +0300
Branches: master
https://developer.blender.org/rB10edaff5c1a18ca7e91743b3244a6007363b592c

Fix ATI part of T45708, crash when enabling opensubdiv.

In fact exit was getting called because we
had an error in shader compilation:

Uniform buffer objects are in fact required.

Since it looks like original intent was to
write the shader against older GLSL version,
I will be adding an extension here instead
of a version.

Thanks to Anshu Arya for letting me borrow his machine through
VPN to do the debugging :)

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

M	intern/opensubdiv/gpu_shader_opensubd_display.glsl

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

diff --git a/intern/opensubdiv/gpu_shader_opensubd_display.glsl b/intern/opensubdiv/gpu_shader_opensubd_display.glsl
index 7fddcf2..ffc8e3d 100644
--- a/intern/opensubdiv/gpu_shader_opensubd_display.glsl
+++ b/intern/opensubdiv/gpu_shader_opensubd_display.glsl
@@ -28,6 +28,7 @@
 #extension GL_EXT_geometry_shader4 : enable
 #extension GL_ARB_gpu_shader5 : enable
 #extension GL_ARB_explicit_attrib_location : require
+#extension GL_ARB_uniform_buffer_object : require
 
 struct VertexData {
 	vec4 position;




More information about the Bf-blender-cvs mailing list