[Bf-blender-cvs] [48aeb0b640] blender2.8: Clay Engine: Renaming shader.

[Clément Foucault]

Commit: 48aeb0b64008a947c5165d45d4a78f142f70e84c
Author: Clément Foucault
Date:   Wed Feb 22 12:50:03 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB48aeb0b64008a947c5165d45d4a78f142f70e84c

Clay Engine: Renaming shader.

===================================================================

M       source/blender/draw/intern/draw_mode_pass.c
M       source/blender/gpu/CMakeLists.txt
M       source/blender/gpu/GPU_shader.h
M       source/blender/gpu/intern/gpu_shader.c
R100    
source/blender/gpu/shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl  
source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl

===================================================================

diff --git a/source/blender/draw/intern/draw_mode_pass.c 
b/source/blender/draw/intern/draw_mode_pass.c
index 08fba9479c..6c041294d3 100644
--- a/source/blender/draw/intern/draw_mode_pass.c
+++ b/source/blender/draw/intern/draw_mode_pass.c
@@ -143,7 +143,7 @@ static DRWShadingGroup 
*shgroup_instance_screenspace(DRWPass *pass, struct Batch
 
 static DRWShadingGroup *shgroup_instance_axis_names(DRWPass *pass, struct 
Batch *geom)
 {
-       GPUShader *sh = 
GPU_shader_get_builtin_shader(GPU_SHADER_3D_SCREENSPACE_AXIS);
+       GPUShader *sh = 
GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS);
 
        DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom);
        DRW_shgroup_attrib_float(grp, "color", 3);
diff --git a/source/blender/gpu/CMakeLists.txt 
b/source/blender/gpu/CMakeLists.txt
index 2249f19881..98c7331e8d 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 f77fd3b6dc..9fe7c7a1c1 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 a9d85838ac..e5c1dfb5bc 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
similarity index 100%
rename from 
source/blender/gpu/shaders/gpu_shader_instance_screenspace_axis_name_vert.glsl
rename to 
source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_axis_name_vert.glsl

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs