diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-01-10 09:36:23 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-01-10 09:36:23 +0300 |
commit | 0372b642705c5304f252f7691b188fc65dd51b59 (patch) | |
tree | e7f1d6fb1dff5889a93d7ec0c363a04e0364365a /source/blender/gpu/CMakeLists.txt | |
parent | d330162ba6981a6c3691bcc8759215463d47f973 (diff) |
OpenGL: port smoke drawing code to GLSL.
Beside the obvious ARB -> GLSL change, the texture slicing algorithm had
to be rewritten.
Although this new algorithm has the same behaviour as the old one (view
aligned slicing), it works with an arbitrary number of slices (which
could eventually be set by the user), which means we can preallocate the
buffer. The previous algorithm would slice from the begining to the end
of the volume's bbox, and draw the slices as it generates them.
Also support for ARB program was removed.
Patch by myself, with some minor fixes by Brecht.
Reviewers: brecht, #opengl_gfx
Differential Revision: https://developer.blender.org/D1694
Diffstat (limited to 'source/blender/gpu/CMakeLists.txt')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 6d3a5d37d66..3b228c18f5e 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -60,9 +60,6 @@ set(SRC intern/gpu_shader.c intern/gpu_texture.c - shaders/gpu_program_smoke_frag.glsl - shaders/gpu_program_smoke_color_frag.glsl - shaders/gpu_shader_fx_lib.glsl shaders/gpu_shader_fx_ssao_frag.glsl shaders/gpu_shader_fx_dof_frag.glsl @@ -80,6 +77,8 @@ set(SRC shaders/gpu_shader_vsm_store_frag.glsl shaders/gpu_shader_vsm_store_vert.glsl shaders/gpu_shader_fx_depth_resolve.glsl + shaders/gpu_shader_smoke_frag.glsl + shaders/gpu_shader_smoke_vert.glsl GPU_basic_shader.h GPU_buffers.h @@ -99,8 +98,8 @@ set(SRC ) data_to_c_simple(shaders/gpu_shader_geometry.glsl SRC) -data_to_c_simple(shaders/gpu_program_smoke_frag.glsl SRC) -data_to_c_simple(shaders/gpu_program_smoke_color_frag.glsl SRC) +data_to_c_simple(shaders/gpu_shader_smoke_frag.glsl SRC) +data_to_c_simple(shaders/gpu_shader_smoke_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_material.glsl SRC) data_to_c_simple(shaders/gpu_shader_sep_gaussian_blur_frag.glsl SRC) data_to_c_simple(shaders/gpu_shader_sep_gaussian_blur_vert.glsl SRC) |