diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 11:04:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 11:04:17 +0400 |
commit | b281b5278f8f40330e0eec263b333f73c99fc08e (patch) | |
tree | e10de9bb09540b7639bccd4a5441ee28e24e6b97 /source/blender/gpu | |
parent | 0f28c1c27aec41dd22e31aac2c02cdfae785dd1b (diff) | |
parent | 7f08c71f43f487cf278684d9170652c8193e7f48 (diff) |
svn merge ^/trunk/blender -r43472:43482
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index d623697921c..203fd00538f 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -653,7 +653,7 @@ static char *code_generate_vertex(ListBase *nodes) int GPU_bicubic_bump_support(void) { - return GLEW_ARB_texture_gather && GLEW_ARB_texture_query_lod && GLEW_VERSION_3_0; + return GLEW_ARB_texture_query_lod && GLEW_VERSION_3_0; } void GPU_code_generate_glsl_lib(void) @@ -669,7 +669,6 @@ void GPU_code_generate_glsl_lib(void) if(GPU_bicubic_bump_support()){ BLI_dynstr_append(ds, "/* These are needed for high quality bump mapping */\n" "#version 130\n" - "#extension GL_ARB_texture_gather: enable\n" "#extension GL_ARB_texture_query_lod: enable\n" "#define BUMP_BICUBIC\n"); } |