diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/gpu | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/gpu/GPU_basic_shader.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/GPU_draw.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_shader_private.h | 1 | ||||
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_basic_frag.glsl | 1 | ||||
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_basic_vert.glsl | 1 | ||||
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl | 1 | ||||
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_vertex_world.glsl | 1 |
10 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index e51b6e1b2ab..27977c16b51 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -256,4 +256,3 @@ if(WITH_OPENSUBDIV) endif() blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}") - diff --git a/source/blender/gpu/GPU_basic_shader.h b/source/blender/gpu/GPU_basic_shader.h index dc378927e79..89d31f57607 100644 --- a/source/blender/gpu/GPU_basic_shader.h +++ b/source/blender/gpu/GPU_basic_shader.h @@ -131,4 +131,3 @@ void GPU_basic_shader_line_width(float line_width); #endif #endif - diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 448945cd7ba..ebce83d2a5f 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -128,4 +128,3 @@ void gpuPopAttrib(void); #endif #endif - diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index a0f425e39d6..278843fc948 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -200,4 +200,3 @@ void gpu_material_add_node(struct GPUMaterial *material, struct GPUNode *node); int GPU_link_changed(struct GPUNodeLink *link); #endif - diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 226711e230f..dff6cfb74a8 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -306,4 +306,3 @@ void GPU_mem_stats_get(int *totalmem, int *freemem) *freemem = 0; } } - diff --git a/source/blender/gpu/intern/gpu_shader_private.h b/source/blender/gpu/intern/gpu_shader_private.h index d8ec6b5d6d1..de5439c5638 100644 --- a/source/blender/gpu/intern/gpu_shader_private.h +++ b/source/blender/gpu/intern/gpu_shader_private.h @@ -41,4 +41,3 @@ struct GPUShader { }; #endif /* __GPU_SHADER_PRIVATE_H__ */ - diff --git a/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl b/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl index 5f7455582cd..c4657bb7f66 100644 --- a/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl @@ -263,4 +263,3 @@ void main() #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl b/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl index bc940222f85..4fdaf809cd1 100644 --- a/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl @@ -73,4 +73,3 @@ void main() varying_texture_coord = (gl_TextureMatrix[0] * gl_MultiTexCoord0).st; #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl index 0fcab6302e4..b4576f75d19 100644 --- a/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl @@ -72,4 +72,3 @@ void main() vert_generic(); #endif } - diff --git a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl index af2e4ba19a2..6f97ef8abef 100644 --- a/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl +++ b/source/blender/gpu/shaders/gpu_shader_vertex_world.glsl @@ -73,4 +73,3 @@ void main() varposition = gl_Vertex.xyz; varnormal = normalize(-varposition); - |