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>2018-04-19 08:47:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-19 08:47:03 +0300
commit1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (patch)
treef8a2465eac96414a4bfe1da812aed48c8e284cb8 /source/blender/gpu/intern
parent5b45d32f3a4dfaa5f65e7ba59311863bf37c08da (diff)
Cleanup: style
Diffstat (limited to 'source/blender/gpu/intern')
-rw-r--r--source/blender/gpu/intern/gpu_batch.c2
-rw-r--r--source/blender/gpu/intern/gpu_framebuffer.c6
-rw-r--r--source/blender/gpu/intern/gpu_material.c2
-rw-r--r--source/blender/gpu/intern/gpu_texture.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 332102aca46..59d88e81822 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -25,7 +25,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/gpu/intern/gpu_basic_shader.c
+/** \file blender/gpu/intern/gpu_batch.c
* \ingroup gpu
*/
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index d31ba79d9ed..cb23b436fcb 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -210,8 +210,8 @@ static void gpu_framebuffer_texture_attach_ex(GPUFrameBuffer *fb, GPUTexture *te
GPUAttachment *attachment = &fb->attachments[type];
if ((attachment->tex == tex) &&
- (attachment->mip == mip) &&
- (attachment->layer == layer))
+ (attachment->mip == mip) &&
+ (attachment->layer == layer))
{
return; /* Exact same texture already bound here. */
}
@@ -543,7 +543,7 @@ void GPU_framebuffer_blit(
BLI_assert(GPU_texture_format(read_tex) == GPU_texture_format(write_tex));
}
if (GPU_texture_samples(write_tex) != 0 ||
- GPU_texture_samples(read_tex) != 0)
+ GPU_texture_samples(read_tex) != 0)
{
/* Can only blit multisample textures to another texture of the same size. */
BLI_assert((fb_read->width == fb_write->width) &&
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 53ef9835d1d..eddd2b85829 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -2558,7 +2558,7 @@ GPUMaterial *GPU_material_from_nodetree(
/* Calls this function if /a mat was created with deferred compilation. */
void GPU_material_generate_pass(
- GPUMaterial *mat, const char *vert_code, const char *geom_code, const char *frag_lib, const char *defines)
+ GPUMaterial *mat, const char *vert_code, const char *geom_code, const char *frag_lib, const char *defines)
{
BLI_assert(mat->pass == NULL); /* Only run once! */
if (mat->outlink) {
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index f449d9b4cdd..bccc818aa34 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -471,8 +471,8 @@ static GPUTexture *GPU_texture_create_nD(
/* Texture Parameters */
if (GPU_texture_stencil(tex) || /* Does not support filtering */
- GPU_texture_integer(tex) || /* Does not support filtering */
- GPU_texture_depth(tex))
+ GPU_texture_integer(tex) || /* Does not support filtering */
+ GPU_texture_depth(tex))
{
glTexParameteri(tex->target_base, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(tex->target_base, GL_TEXTURE_MAG_FILTER, GL_NEAREST);