diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 19:46:51 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 19:48:29 +0300 |
commit | 342e73f90fc5c41af8db3a6e3dfdf1746f7f5bc4 (patch) | |
tree | 47fdb91d8e16b1c89f9ca358cb0172e862905ee1 /source/blender/gpu | |
parent | 9682e43bf9e078165b3d4d52c6a19c430ec2cbf2 (diff) |
Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz.
Differential Revision: https://developer.blender.org/D3719
Diffstat (limited to 'source/blender/gpu')
22 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.h index 3e32b64b281..4d667a02fac 100644 --- a/source/blender/gpu/GPU_context.h +++ b/source/blender/gpu/GPU_context.h @@ -26,7 +26,7 @@ /** \file blender/gpu/GPU_context.h * \ingroup gpu * - * This interface allow GPU to manage VAOs for mutiple context and threads. + * This interface allow GPU to manage VAOs for multiple context and threads. */ #ifndef __GPU_CONTEXT_H__ diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.h index 9f1d9646246..7baf359c52e 100644 --- a/source/blender/gpu/GPU_immediate_util.h +++ b/source/blender/gpu/GPU_immediate_util.h @@ -28,7 +28,7 @@ #define __GPU_IMMEDIATE_UTIL_H__ /* Draw 2D rectangles (replaces glRect functions) */ -/* caller is reponsible for vertex format & shader */ +/* caller is responsible for vertex format & shader */ void immRectf(uint pos, float x1, float y1, float x2, float y2); void immRecti(uint pos, int x1, int y1, int x2, int y2); diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index d14164e930e..1a1d40b32c2 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -73,7 +73,7 @@ void GPU_shader_free(GPUShader *shader); void GPU_shader_bind(GPUShader *shader); void GPU_shader_unbind(void); -/* Returns true if transform feedback was succesfully enabled. */ +/* Returns true if transform feedback was successfully enabled. */ bool GPU_shader_transform_feedback_enable(GPUShader *shader, unsigned int vbo_id); void GPU_shader_transform_feedback_disable(GPUShader *shader); @@ -197,7 +197,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR, GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR, /** - * Draw texture with alpha. Take a 3D positon and a 2D texture coordinate for each vertex. + * Draw texture with alpha. Take a 3D position and a 2D texture coordinate for each vertex. * * \param alpha: uniform float * \param image: uniform sampler2D @@ -207,7 +207,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_IMAGE_MODULATE_ALPHA, /** * Draw linearized depth texture relate to near and far distances. - * Take a 3D positon and a 2D texture coordinate for each vertex. + * Take a 3D position and a 2D texture coordinate for each vertex. * * \param znear: uniform float * \param zfar: uniform float diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h index 921cd0e7369..45712050b73 100644 --- a/source/blender/gpu/GPU_viewport.h +++ b/source/blender/gpu/GPU_viewport.h @@ -43,7 +43,7 @@ typedef struct GPUViewport GPUViewport; -/* Contains memory pools informations */ +/* Contains memory pools information */ typedef struct ViewportMemoryPool { struct BLI_mempool *calls; struct BLI_mempool *states; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 5d34cdbb6fb..38edcbe7f71 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -413,7 +413,7 @@ void GPU_pbvh_grid_buffers_update( GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf_fast); } else if (!buffers->smooth && buffers->index_buf != NULL) { - /* Discard unecessary index buffers. */ + /* Discard unnecessary index buffers. */ GPU_BATCH_DISCARD_SAFE(buffers->triangles); GPU_BATCH_DISCARD_SAFE(buffers->triangles_fast); GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf); diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 69801f64ab1..c1e6b9b53a0 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -873,7 +873,7 @@ static char *code_generate_vertex(ListBase *nodes, const char *vert_code, bool u /* XXX FIXME : see notes in mesh_render_data_create() */ /* NOTE : Replicate changes to mesh_render_data_create() in draw_cache_impl_mesh.c */ if (input->attribtype == CD_ORCO) { - /* orco is computed from local positions, see bellow */ + /* orco is computed from local positions, see below */ BLI_dynstr_appendf(ds, "uniform vec3 OrcoTexCoFactors[2];\n"); } else if (input->attribname[0] == '\0') { diff --git a/source/blender/gpu/intern/gpu_context_private.h b/source/blender/gpu/intern/gpu_context_private.h index 762d9ff10c0..7f13dd542da 100644 --- a/source/blender/gpu/intern/gpu_context_private.h +++ b/source/blender/gpu/intern/gpu_context_private.h @@ -26,7 +26,7 @@ /** \file blender/gpu/intern/gpu_context_private.h * \ingroup gpu * - * This interface allow GPU to manage GL objects for mutiple context and threads. + * This interface allow GPU to manage GL objects for multiple context and threads. */ #ifndef __GPU_CONTEXT_PRIVATE_H__ diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index 270dc014f7b..346d1320b75 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -75,7 +75,7 @@ struct GPUFrameBuffer { int width, height; bool multisample; /* TODO Check that we always use the right context when binding - * (FBOs are not shared accross ogl contexts). */ + * (FBOs are not shared across ogl contexts). */ // void *ctx; }; diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index d5aa7177e11..ac97867f40f 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -67,7 +67,7 @@ typedef struct GPUColorBandBuilder { } GPUColorBandBuilder; struct GPUMaterial { - Scene *scene; /* DEPRECATED was only usefull for lamps */ + Scene *scene; /* DEPRECATED was only useful for lamps */ Material *ma; /* material for mesh surface, worlds or something else. @@ -141,7 +141,7 @@ enum { /* Functions */ -/* Returns the adress of the future pointer to coba_tex */ +/* Returns the address of the future pointer to coba_tex */ GPUTexture **gpu_material_ramp_texture_row_set(GPUMaterial *mat, int size, float *pixels, float *row) { /* In order to put all the colorbands into one 1D array texture, @@ -467,7 +467,7 @@ static void compute_sss_translucence_kernel( /* Distance from surface. */ float d = kd->max_radius * ((float)i + 0.00001f) / ((float)resolution); - /* For each distance d we compute the radiance incomming from an hypothetic parallel plane. */ + /* For each distance d we compute the radiance incoming from an hypothetic parallel plane. */ /* Compute radius of the footprint on the hypothetic plane */ float r_fp = sqrtf(kd->max_radius * kd->max_radius - d * d); float r_step = r_fp / INTEGRAL_RESOLUTION; @@ -482,7 +482,7 @@ static void compute_sss_translucence_kernel( profile[1] = eval_profile(dist, falloff_type, sharpness, kd->param[1]); profile[2] = eval_profile(dist, falloff_type, sharpness, kd->param[2]); - /* Since the profile and configuration are radially symetrical we + /* Since the profile and configuration are radially symmetrical we * can just evaluate it once and weight it accordingly */ float r_next = r + r_step; float disk_area = (M_PI * r_next * r_next) - (M_PI * r * r); diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 0ef1700b348..abb632ce718 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -764,7 +764,7 @@ GPUTexture *GPU_texture_create_buffer(GPUTextureFormat tex_format, const GLuint if (!tex->bindcode) { fprintf(stderr, "GPUTexture: texture create failed\n"); GPU_texture_free(tex); - BLI_assert(0 && "glGenTextures failled: Are you sure a valid OGL context is active on this thread?\n"); + BLI_assert(0 && "glGenTextures failed: Are you sure a valid OGL context is active on this thread?\n"); return NULL; } @@ -1441,7 +1441,7 @@ int GPU_texture_detach_framebuffer(GPUTexture *tex, GPUFrameBuffer *fb) void GPU_texture_get_mipmap_size(GPUTexture *tex, int lvl, int *size) { - /* TODO assert if lvl is bellow the limit of 1px in each dimension. */ + /* TODO assert if lvl is below the limit of 1px in each dimension. */ int div = 1 << lvl; size[0] = max_ii(1, tex->w / div); diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c index 82b82d622a4..9bc3727bb03 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.c +++ b/source/blender/gpu/intern/gpu_uniformbuffer.c @@ -291,7 +291,7 @@ static void gpu_uniformbuffer_inputs_sort(ListBase *inputs) while (link != NULL && ((GPUInput *)link->data)->type == GPU_VEC3) { LinkData *link_next = link->next; - /* If GPU_VEC3 is followed by nothing or a GPU_FLOAT, no need for aligment. */ + /* If GPU_VEC3 is followed by nothing or a GPU_FLOAT, no need for alignment. */ if ((link_next == NULL) || ((GPUInput *)link_next->data)->type == GPU_FLOAT) { diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.c b/source/blender/gpu/intern/gpu_vertex_buffer.c index 05100b8a23f..b6058a2cb79 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.c +++ b/source/blender/gpu/intern/gpu_vertex_buffer.c @@ -155,7 +155,7 @@ void GPU_vertbuf_data_resize(GPUVertBuf *verts, uint v_len) /* Set vertex count but does not change allocation. * Only this many verts will be uploaded to the GPU and rendered. - * This is usefull for streaming data. */ + * This is useful for streaming data. */ void GPU_vertbuf_vertex_count_set(GPUVertBuf *verts, uint v_len) { #if TRUST_NO_ONE diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index fe98477f28c..1dd3faa3b03 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -288,7 +288,7 @@ double *GPU_viewport_cache_time_get(GPUViewport *viewport) } /** - * Try to find a texture coresponding to params into the texture pool. + * Try to find a texture corresponding to params into the texture pool. * If no texture was found, create one and add it to the pool. */ GPUTexture *GPU_viewport_texture_pool_query(GPUViewport *viewport, void *engine, int width, int height, int format) diff --git a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl index aec8fd9b0a1..805ecd6085f 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in float pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl index ced5bb7f684..255eeb9baf1 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl index 9876717b297..d2b64608eaa 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewMatrix; uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; in vec3 nor; diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl index 2ee74b3eae0..429b648ca53 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform vec3 screen_vecs[2]; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* using Z as axis id */ /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl index ba0ac29fb79..2a4675ce2c9 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl @@ -4,7 +4,7 @@ uniform vec3 screen_vecs[2]; uniform float size; uniform float pixel_size; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec2 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl index 1c49d9dec3e..1ec158ae15c 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform float alpha; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl index 49750dddb3c..f265bf9fc01 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform int baseId; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl index eac167e8045..a4facae435e 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 8fa1828bd9c..64f04e5b1fe 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -1375,7 +1375,7 @@ void node_subsurface_scattering( eevee_closure_subsurface(N, color.rgb, 1.0, scale, out_diff, out_trans); result.sss_data.rgb = out_diff + out_trans; # ifdef USE_SSS_ALBEDO - /* Not perfect for texture_blur not exaclty equal to 0.0 or 1.0. */ + /* Not perfect for texture_blur not exactly equal to 0.0 or 1.0. */ result.sss_albedo.rgb = mix(color.rgb, vec3(1.0), texture_blur); result.sss_data.rgb *= mix(vec3(1.0), color.rgb, texture_blur); # else |