diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-22 14:50:03 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-22 14:50:03 +0300 |
| commit | 48aeb0b64008a947c5165d45d4a78f142f70e84c (patch) | |
| tree | 7685068dbb91437ac6ec1c150add04a68a628929 /source/blender/gpu | |
| parent | 6dbc6dfc14e749f929be93a5025b255d41c30941 (diff) | |
Clay Engine: Renaming shader.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 4 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl (renamed from source/blender/gpu/shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 2249f198813..98c7331e8dc 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -160,7 +160,7 @@ data_to_c_simple(shaders/gpu_shader_instance_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl SRC) -data_to_c_simple(shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl SRC) +data_to_c_simple(shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_3D_groundline_geom.glsl SRC) data_to_c_simple(shaders/gpu_shader_3D_groundpoint_vert.glsl SRC) diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index f77fd3b6dc6..9fe7c7a1c14 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -143,7 +143,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_OBJECTSPACE_VARIYING_COLOR, GPU_SHADER_3D_OBJECTSPACE_SIMPLE_LIGHTING_VARIYING_COLOR, /* axis name */ - GPU_SHADER_3D_SCREENSPACE_AXIS, + GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS, /* instance */ GPU_SHADER_INSTANCE_UNIFORM_COLOR, GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index a9d85838ac7..e5c1dfb5bcc 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -77,7 +77,7 @@ extern char datatoc_gpu_shader_instance_vert_glsl[]; extern char datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl[]; extern char datatoc_gpu_shader_instance_objectspace_variying_color_vert_glsl[]; extern char datatoc_gpu_shader_instance_screenspace_variying_color_vert_glsl[]; -extern char datatoc_gpu_shader_instance_screenspace_axis_name_vert_glsl[]; +extern char datatoc_gpu_shader_instance_screen_aligned_axis_name_vert_glsl[]; extern char datatoc_gpu_shader_3D_groundpoint_vert_glsl[]; extern char datatoc_gpu_shader_3D_groundline_geom_glsl[]; @@ -709,7 +709,7 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader) datatoc_gpu_shader_flat_color_frag_glsl}, [GPU_SHADER_3D_SCREENSPACE_VARIYING_COLOR] = { datatoc_gpu_shader_instance_screenspace_variying_color_vert_glsl, datatoc_gpu_shader_flat_color_frag_glsl}, - [GPU_SHADER_3D_SCREENSPACE_AXIS] = { datatoc_gpu_shader_instance_screenspace_axis_name_vert_glsl, + [GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS] = { datatoc_gpu_shader_instance_screen_aligned_axis_name_vert_glsl, datatoc_gpu_shader_flat_color_frag_glsl}, [GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR] = diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl index a39bfde41ee..a39bfde41ee 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl |