[Bf-blender-cvs] [b26eb47] master: OpenSubdiv: Corrections to GLSL version
Sergey Sharybin
noreply at git.blender.org
Mon Aug 3 15:30:27 CEST 2015
Commit: b26eb4796124670c82b84138faf614287a2b28d8
Author: Sergey Sharybin
Date: Mon Aug 3 15:27:06 2015 +0200
Branches: master
https://developer.blender.org/rBb26eb4796124670c82b84138faf614287a2b28d8
OpenSubdiv: Corrections to GLSL version
Was own mistake in the last minute fixes, now matcaps should
work just fine.
===================================================================
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 ca9b422..17d2b64 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1533,7 +1533,7 @@ static const char *gpu_shader_version(bool use_opensubdiv)
{
#ifdef WITH_OPENSUBDIV
if (use_opensubdiv) {
- return "#version 150";
+ return "#version 130\n";
}
#else
UNUSED_VARS(use_opensubdiv);
@@ -1678,7 +1678,7 @@ void GPU_program_parameter_4f(GPUProgram *program, unsigned int location, float
GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, const char *geocode, const char *libcode, const char *defines, int input, int output, int number)
{
-#ifdef WITH_OPENSUBDIF
+#ifdef WITH_OPENSUBDIV
/* TODO(sergey): used to add #version 150 to the geometry shader.
* Could safely be renamed to "use_geometry_code" since it's evry much
* liely any of geometry code will want to use GLSL 1.5.
More information about the Bf-blender-cvs
mailing list