Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-20 10:17:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-20 10:25:27 +0300
commit4fa904e91c78148ba39ac40371d7680294e225bf (patch)
treeec6c1c6f6a1263e29900bedc9e876d941cc3febf /source/blender/draw/intern
parentdb5a82302cb322b24d0e0a315e6af499706e8aca (diff)
Cleanup: use lowercase for dimensions in function names
Most API's already use this convention.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/DRW_render.h20
-rw-r--r--source/blender/draw/intern/draw_common.c4
-rw-r--r--source/blender/draw/intern/draw_hair.c2
-rw-r--r--source/blender/draw/intern/draw_manager.c4
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c6
-rw-r--r--source/blender/draw/intern/draw_manager_texture.c26
6 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index dee686e270e..5c505f1b234 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -194,22 +194,22 @@ typedef enum {
/* Textures from DRW_texture_pool_query_* have the options
* DRW_TEX_FILTER for color float textures, and no options
* for depth textures and integer textures. */
-struct GPUTexture *DRW_texture_pool_query_2D(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type);
+struct GPUTexture *DRW_texture_pool_query_2d(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type);
-struct GPUTexture *DRW_texture_create_1D(
+struct GPUTexture *DRW_texture_create_1d(
int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels);
-struct GPUTexture *DRW_texture_create_2D(
+struct GPUTexture *DRW_texture_create_2d(
int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels);
-struct GPUTexture *DRW_texture_create_2D_array(
+struct GPUTexture *DRW_texture_create_2d_array(
int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels);
-struct GPUTexture *DRW_texture_create_3D(
+struct GPUTexture *DRW_texture_create_3d(
int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels);
struct GPUTexture *DRW_texture_create_cube(
int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels);
-void DRW_texture_ensure_fullscreen_2D(
+void DRW_texture_ensure_fullscreen_2d(
struct GPUTexture **tex, eGPUTextureFormat format, DRWTextureFlag flags);
-void DRW_texture_ensure_2D(
+void DRW_texture_ensure_2d(
struct GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags);
void DRW_texture_generate_mipmaps(struct GPUTexture *tex);
@@ -245,10 +245,10 @@ struct GPUShader *DRW_shader_create_with_lib(
struct GPUShader *DRW_shader_create_with_transform_feedback(
const char *vert, const char *geom, const char *defines,
const eGPUShaderTFBType prim_type, const char **varying_names, const int varying_count);
-struct GPUShader *DRW_shader_create_2D(const char *frag, const char *defines);
-struct GPUShader *DRW_shader_create_3D(const char *frag, const char *defines);
+struct GPUShader *DRW_shader_create_2d(const char *frag, const char *defines);
+struct GPUShader *DRW_shader_create_3d(const char *frag, const char *defines);
struct GPUShader *DRW_shader_create_fullscreen(const char *frag, const char *defines);
-struct GPUShader *DRW_shader_create_3D_depth_only(eGPUShaderConfig slot);
+struct GPUShader *DRW_shader_create_3d_depth_only(eGPUShaderConfig slot);
struct GPUMaterial *DRW_shader_find_from_world(struct World *wo, const void *engine_type, int options, bool deferred);
struct GPUMaterial *DRW_shader_find_from_material(struct Material *ma, const void *engine_type, int options, bool deferred);
struct GPUMaterial *DRW_shader_create_from_world(
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 2d1316f9406..49cc6669ba5 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -182,7 +182,7 @@ void DRW_globals_update(void)
BKE_colorband_evaluate_table_rgba(&ramp, &colors, &col_size);
- G_draw.ramp = GPU_texture_create_1D(col_size, GPU_RGBA8, colors, NULL);
+ G_draw.ramp = GPU_texture_create_1d(col_size, GPU_RGBA8, colors, NULL);
MEM_freeN(colors);
}
@@ -1133,5 +1133,5 @@ static GPUTexture *DRW_create_weight_colorramp_texture(void)
pixels[i][3] = 1.0f;
}
- return GPU_texture_create_1D(256, GPU_RGBA8, pixels[0], error);
+ return GPU_texture_create_1d(256, GPU_RGBA8, pixels[0], error);
}
diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c
index bbe5b4cf41e..1d0fb5cb2a8 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -263,7 +263,7 @@ void DRW_hair_update(void)
* Do chunks of maximum 2048 * 2048 hair points. */
int width = 2048;
int height = min_ii(width, 1 + max_size / width);
- GPUTexture *tex = DRW_texture_pool_query_2D(width, height, GPU_RGBA32F, (void *)DRW_hair_update);
+ GPUTexture *tex = DRW_texture_pool_query_2d(width, height, GPU_RGBA32F, (void *)DRW_hair_update);
g_tf_target_height = height;
g_tf_target_width = width;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 45a49f2a25f..db565b96dab 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2043,7 +2043,7 @@ static void draw_select_framebuffer_depth_only_setup(const rcti *rect)
}
if (g_select_buffer.texture_depth == NULL) {
- g_select_buffer.texture_depth = GPU_texture_create_2D(
+ g_select_buffer.texture_depth = GPU_texture_create_2d(
size[0], size[1], GPU_DEPTH_COMPONENT24, NULL, NULL);
GPU_framebuffer_texture_attach(
@@ -2078,7 +2078,7 @@ static void draw_select_framebuffer_select_id_setup(const rcti *rect)
}
if (g_select_buffer.texture_u32 == NULL) {
- g_select_buffer.texture_u32 = GPU_texture_create_2D(
+ g_select_buffer.texture_u32 = GPU_texture_create_2d(
size[0], size[1], GPU_R32UI, NULL, NULL);
GPU_framebuffer_texture_attach(
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 54ad98d3189..1fc6b61b87a 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -297,12 +297,12 @@ GPUShader *DRW_shader_create_with_transform_feedback(
prim_type, varying_names, varying_count, __func__);
}
-GPUShader *DRW_shader_create_2D(const char *frag, const char *defines)
+GPUShader *DRW_shader_create_2d(const char *frag, const char *defines)
{
return GPU_shader_create(datatoc_gpu_shader_2D_vert_glsl, frag, NULL, NULL, defines, __func__);
}
-GPUShader *DRW_shader_create_3D(const char *frag, const char *defines)
+GPUShader *DRW_shader_create_3d(const char *frag, const char *defines)
{
return GPU_shader_create(datatoc_gpu_shader_3D_vert_glsl, frag, NULL, NULL, defines, __func__);
}
@@ -312,7 +312,7 @@ GPUShader *DRW_shader_create_fullscreen(const char *frag, const char *defines)
return GPU_shader_create(datatoc_common_fullscreen_vert_glsl, frag, NULL, NULL, defines, __func__);
}
-GPUShader *DRW_shader_create_3D_depth_only(eGPUShaderConfig sh_cfg)
+GPUShader *DRW_shader_create_3d_depth_only(eGPUShaderConfig sh_cfg)
{
return GPU_shader_get_builtin_shader_with_config(GPU_SHADER_3D_DEPTH_ONLY, sh_cfg);
}
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 235523f15c5..92fca2d4f04 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -73,35 +73,35 @@ void drw_texture_set_parameters(GPUTexture *tex, DRWTextureFlag flags)
GPU_texture_unbind(tex);
}
-GPUTexture *DRW_texture_create_1D(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+GPUTexture *DRW_texture_create_1d(int w, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_1D(w, format, fpixels, NULL);
+ GPUTexture *tex = GPU_texture_create_1d(w, format, fpixels, NULL);
drw_texture_set_parameters(tex, flags);
return tex;
}
-GPUTexture *DRW_texture_create_2D(int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
+GPUTexture *DRW_texture_create_2d(int w, int h, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_2D(w, h, format, fpixels, NULL);
+ GPUTexture *tex = GPU_texture_create_2d(w, h, format, fpixels, NULL);
drw_texture_set_parameters(tex, flags);
return tex;
}
-GPUTexture *DRW_texture_create_2D_array(
+GPUTexture *DRW_texture_create_2d_array(
int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_2D_array(w, h, d, format, fpixels, NULL);
+ GPUTexture *tex = GPU_texture_create_2d_array(w, h, d, format, fpixels, NULL);
drw_texture_set_parameters(tex, flags);
return tex;
}
-GPUTexture *DRW_texture_create_3D(
+GPUTexture *DRW_texture_create_3d(
int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels)
{
- GPUTexture *tex = GPU_texture_create_3D(w, h, d, format, fpixels, NULL);
+ GPUTexture *tex = GPU_texture_create_3d(w, h, d, format, fpixels, NULL);
drw_texture_set_parameters(tex, flags);
return tex;
@@ -115,7 +115,7 @@ GPUTexture *DRW_texture_create_cube(int w, eGPUTextureFormat format, DRWTextureF
return tex;
}
-GPUTexture *DRW_texture_pool_query_2D(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type)
+GPUTexture *DRW_texture_pool_query_2d(int w, int h, eGPUTextureFormat format, DrawEngineType *engine_type)
{
BLI_assert(drw_texture_format_supports_framebuffer(format));
GPUTexture *tex = GPU_viewport_texture_pool_query(DST.viewport, engine_type, w, h, format);
@@ -123,18 +123,18 @@ GPUTexture *DRW_texture_pool_query_2D(int w, int h, eGPUTextureFormat format, Dr
return tex;
}
-void DRW_texture_ensure_fullscreen_2D(GPUTexture **tex, eGPUTextureFormat format, DRWTextureFlag flags)
+void DRW_texture_ensure_fullscreen_2d(GPUTexture **tex, eGPUTextureFormat format, DRWTextureFlag flags)
{
if (*(tex) == NULL) {
const float *size = DRW_viewport_size_get();
- *(tex) = DRW_texture_create_2D((int)size[0], (int)size[1], format, flags, NULL);
+ *(tex) = DRW_texture_create_2d((int)size[0], (int)size[1], format, flags, NULL);
}
}
-void DRW_texture_ensure_2D(GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags)
+void DRW_texture_ensure_2d(GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags)
{
if (*(tex) == NULL) {
- *(tex) = DRW_texture_create_2D(w, h, format, flags, NULL);
+ *(tex) = DRW_texture_create_2d(w, h, format, flags, NULL);
}
}