diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 13:31:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 13:32:42 +0300 |
| commit | 90aa02290ac87a08cef948efb3ee67335276468a (patch) | |
| tree | c5d28fa1ebc8cb984980ae344128c15635e61360 /source/blender/gpu | |
| parent | 6bca0dcf7bd6c071f0b03234ac448d5e8e15fdc5 (diff) | |
Cleanup: rename GPU gawain functions
Were using Batch_ prefix still
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_batch.h | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_batch.c | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 966690c19b2..27d1d1f902e 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -39,11 +39,11 @@ #include "GPU_shader.h" /* Extend GWN_batch_program_set to use Blender’s library of built-in shader programs. */ -void Batch_set_builtin_program(Gwn_Batch*, GPUBuiltinShader); +void GWN_batch_program_set_builtin(Gwn_Batch*, GPUBuiltinShader); /* Replacement for gluSphere */ -Gwn_Batch *Batch_get_sphere(int lod); -Gwn_Batch *Batch_get_sphere_wire(int lod); +Gwn_Batch *GPU_batch_preset_sphere(int lod); +Gwn_Batch *GPU_batch_preset_sphere_wire(int lod); void gpu_batch_init(void); void gpu_batch_exit(void); diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c index cb2b65d1a67..5d347fc80e8 100644 --- a/source/blender/gpu/intern/gpu_batch.c +++ b/source/blender/gpu/intern/gpu_batch.c @@ -31,7 +31,7 @@ #include "GPU_batch.h" #include "gpu_shader_private.h" -void Batch_set_builtin_program(Gwn_Batch *batch, GPUBuiltinShader shader_id) +void GWN_batch_program_set_builtin(Gwn_Batch *batch, GPUBuiltinShader shader_id) { GPUShader *shader = GPU_shader_get_builtin_shader(shader_id); GWN_batch_program_set(batch, shader->program, shader->interface); @@ -128,7 +128,7 @@ static Gwn_Batch *batch_sphere_wire(int lat_res, int lon_res) return GWN_batch_create_ex(GWN_PRIM_LINES, vbo, NULL, GWN_BATCH_OWNS_VBO); } -Gwn_Batch *Batch_get_sphere(int lod) +Gwn_Batch *GPU_batch_preset_sphere(int lod) { BLI_assert(lod >= 0 && lod <= 2); @@ -140,7 +140,7 @@ Gwn_Batch *Batch_get_sphere(int lod) return sphere_high; } -Gwn_Batch *Batch_get_sphere_wire(int lod) +Gwn_Batch *GPU_batch_preset_sphere_wire(int lod) { BLI_assert(lod >= 0 && lod <= 1); diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index cfb94cadaa9..48a8267bff2 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -480,7 +480,7 @@ void GPU_framebuffer_blur( GPU_texture_bind(tex, 0); - Batch_set_builtin_program(&batch, GPU_SHADER_SEP_GAUSSIAN_BLUR); + GWN_batch_program_set_builtin(&batch, GPU_SHADER_SEP_GAUSSIAN_BLUR); GWN_batch_uniform_2f(&batch, "ScaleU", scaleh[0], scaleh[1]); GWN_batch_uniform_1i(&batch, "textureSource", GL_TEXTURE0); GWN_batch_draw(&batch); @@ -496,7 +496,7 @@ void GPU_framebuffer_blur( GPU_texture_bind(blurtex, 0); /* Hack to make the following uniform stick */ - Batch_set_builtin_program(&batch, GPU_SHADER_SEP_GAUSSIAN_BLUR); + GWN_batch_program_set_builtin(&batch, GPU_SHADER_SEP_GAUSSIAN_BLUR); GWN_batch_uniform_2f(&batch, "ScaleU", scalev[0], scalev[1]); GWN_batch_uniform_1i(&batch, "textureSource", GL_TEXTURE0); GWN_batch_draw(&batch); |