diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:42:30 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:42:30 +0300 |
commit | c409acd84234aae715d64857ed8b696d4f5ce85e (patch) | |
tree | a14065f0e0db2f402bea07b65549392708f1325a /source/blender/gpu/intern/gpu_shader.c | |
parent | 1f46da922a98c6badf6e2de13304358b3b0b7576 (diff) |
Cleanup: removing dummy legacy dashed line shader.
Dashed requires geom shader, which was not available with older OpenGL,
now that we are on 3.3 we do not need that dummy workaround anymore.
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 83e126bd39f..d52be6ef6e4 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -113,7 +113,6 @@ extern char datatoc_gpu_shader_2D_point_uniform_size_aa_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert_glsl[]; -extern char datatoc_gpu_shader_2D_line_dashed_legacy_vert_glsl[]; extern char datatoc_gpu_shader_2D_line_dashed_vert_glsl[]; extern char datatoc_gpu_shader_2D_line_dashed_frag_glsl[]; extern char datatoc_gpu_shader_2D_line_dashed_geom_glsl[]; @@ -791,14 +790,6 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader) stages = &legacy_fancy_edges; } - if (shader == GPU_SHADER_2D_LINE_DASHED_COLOR && !GLEW_VERSION_3_2) { - /* Dashed need geometry shader, which are not supported by legacy OpenGL, fallback to solid lines. */ - /* TODO: remove after switch to core profile (maybe) */ - static const GPUShaderStages legacy_dashed_lines = { datatoc_gpu_shader_2D_line_dashed_legacy_vert_glsl, - datatoc_gpu_shader_2D_line_dashed_frag_glsl }; - stages = &legacy_dashed_lines; - } - if (shader == GPU_SHADER_3D_LINE_DASHED_COLOR && !GLEW_VERSION_3_2) { /* Dashed need geometry shader, which are not supported by legacy OpenGL, fallback to solid lines. */ /* TODO: remove after switch to core profile (maybe) */ |