diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-03-22 18:10:54 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-03-22 18:11:49 +0300 |
commit | 47acd706fde992e1b4f940145724aae9bf896861 (patch) | |
tree | fb4fdac6d6c92a247c7604ed0b4f16a4517e06dd /source/blender/draw | |
parent | 6939523a152891153a1eebbad6e730e7a43c6f08 (diff) |
GPUCompositing: Remove entire module.
This module has no use now with the new DrawManager and DrawEngines and it
is using deprecated paths.
Moving gpu_shader_fullscreen_vert.glsl
to draw/modes/shaders/common_fullscreen_vert.glsl
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/shaders/common_fullscreen_vert.glsl | 10 |
5 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 733e4b0b524..f7d3a37246e 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -208,6 +208,7 @@ data_to_c_simple(engines/eevee/shaders/volumetric_integration_frag.glsl SRC) data_to_c_simple(modes/shaders/common_globals_lib.glsl SRC) data_to_c_simple(modes/shaders/common_view_lib.glsl SRC) data_to_c_simple(modes/shaders/common_fxaa_lib.glsl SRC) +data_to_c_simple(modes/shaders/common_fullscreen_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_frag.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_vert.glsl SRC) data_to_c_simple(modes/shaders/edit_mesh_overlay_geom_tri.glsl SRC) diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 0c0ffa39146..85b168d1075 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -76,7 +76,7 @@ extern char datatoc_volumetric_resolve_frag_glsl[]; extern char datatoc_volumetric_scatter_frag_glsl[]; extern char datatoc_volumetric_integration_frag_glsl[]; extern char datatoc_volumetric_lib_glsl[]; -extern char datatoc_gpu_shader_fullscreen_vert_glsl[]; +extern char datatoc_common_fullscreen_vert_glsl[]; static void eevee_create_shader_volumes(void) { @@ -126,7 +126,7 @@ static void eevee_create_shader_volumes(void) datatoc_volumetric_integration_frag_glsl, e_data.volumetric_common_lib, NULL); e_data.volumetric_resolve_sh = DRW_shader_create_with_lib( - datatoc_gpu_shader_fullscreen_vert_glsl, NULL, + datatoc_common_fullscreen_vert_glsl, NULL, datatoc_volumetric_resolve_frag_glsl, e_data.volumetric_common_lib, NULL); } diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index d150bcc8d56..5b4971f0730 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -45,7 +45,7 @@ extern char datatoc_gpu_shader_2D_vert_glsl[]; extern char datatoc_gpu_shader_3D_vert_glsl[]; -extern char datatoc_gpu_shader_fullscreen_vert_glsl[]; +extern char datatoc_common_fullscreen_vert_glsl[]; /* -------------------------------------------------------------------- */ @@ -297,7 +297,7 @@ GPUShader *DRW_shader_create_3D(const char *frag, const char *defines) GPUShader *DRW_shader_create_fullscreen(const char *frag, const char *defines) { - return GPU_shader_create(datatoc_gpu_shader_fullscreen_vert_glsl, frag, NULL, NULL, defines); + return GPU_shader_create(datatoc_common_fullscreen_vert_glsl, frag, NULL, NULL, defines); } GPUShader *DRW_shader_create_3D_depth_only(void) diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index ccdac1f8687..b5127ca634d 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -83,7 +83,7 @@ extern char datatoc_object_particle_dot_frag_glsl[]; extern char datatoc_common_globals_lib_glsl[]; extern char datatoc_common_fxaa_lib_glsl[]; extern char datatoc_gpu_shader_flat_color_frag_glsl[]; -extern char datatoc_gpu_shader_fullscreen_vert_glsl[]; +extern char datatoc_common_fullscreen_vert_glsl[]; extern char datatoc_gpu_shader_uniform_color_frag_glsl[]; /* *********** LISTS *********** */ @@ -307,7 +307,7 @@ static void OBJECT_engine_init(void *vedata) if (!e_data.outline_resolve_aa_sh) { e_data.outline_resolve_aa_sh = DRW_shader_create_with_lib( - datatoc_gpu_shader_fullscreen_vert_glsl, NULL, + datatoc_common_fullscreen_vert_glsl, NULL, datatoc_object_outline_resolve_frag_glsl, datatoc_common_fxaa_lib_glsl, "#define FXAA_ALPHA\n" diff --git a/source/blender/draw/modes/shaders/common_fullscreen_vert.glsl b/source/blender/draw/modes/shaders/common_fullscreen_vert.glsl new file mode 100644 index 00000000000..fc5cc1cdcc3 --- /dev/null +++ b/source/blender/draw/modes/shaders/common_fullscreen_vert.glsl @@ -0,0 +1,10 @@ + +in vec2 pos; +in vec2 uvs; +out vec4 uvcoordsvar; + +void main() +{ + uvcoordsvar = vec4(uvs, 0.0, 0.0); + gl_Position = vec4(pos, 0.0, 1.0); +} |