diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
| commit | 857df8065face58eff5556953cdf2dd72e09f2b6 (patch) | |
| tree | 51fdb13476e00b7ec1a7575d9c0293de2b17bd7d /source/blender/gpu/intern | |
| parent | ddf39a87aa704240a0cb0cac584893ba34700e5d (diff) | |
style cleanup
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 07462302700..a633b39cb32 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -92,7 +92,7 @@ void GPU_render_text(MTFace *tface, int mode, float *v1, float *v2, float *v3, float *v4, int glattrib) { if ((mode & GEMAT_TEXT) && (textlen>0) && tface->tpage) { - Image* ima = (Image*)tface->tpage; + Image* ima = (Image *)tface->tpage; int index, character; float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance; float advance_tab; @@ -813,7 +813,7 @@ void GPU_create_gl_tex_compressed(unsigned int *bind, unsigned int *pix, int x, glBindTexture(GL_TEXTURE_2D, *bind); if (GPU_upload_dxt_texture(ibuf) == 0) { - glDeleteTextures(1, (GLuint*)bind); + glDeleteTextures(1, (GLuint *)bind); GPU_create_gl_tex(bind, pix, NULL, x, y, mipmap, 0, ima); } #endif diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 7a0ac29c9ab..bc859d0ec07 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -134,8 +134,8 @@ void GPU_extensions_init(void) glGetIntegerv(GL_BLUE_BITS, &b); GG.colordepth = r+g+b; /* assumes same depth for RGB */ - vendor = (const char*)glGetString(GL_VENDOR); - renderer = (const char*)glGetString(GL_RENDERER); + vendor = (const char *)glGetString(GL_VENDOR); + renderer = (const char *)glGetString(GL_RENDERER); if (strstr(vendor, "ATI")) { GG.device = GPU_DEVICE_ATI; @@ -916,7 +916,7 @@ void GPU_framebuffer_blur(GPUFrameBuffer *fb, GPUTexture *tex, GPUFrameBuffer *b glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, blurfb->object); GPU_shader_bind(blur_shader); - GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float*)scaleh); + GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float *)scaleh); GPU_shader_uniform_texture(blur_shader, texture_source_uniform, tex); glViewport(0, 0, GPU_texture_opengl_width(blurtex), GPU_texture_opengl_height(blurtex)); @@ -942,7 +942,7 @@ void GPU_framebuffer_blur(GPUFrameBuffer *fb, GPUTexture *tex, GPUFrameBuffer *b glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb->object); glViewport(0, 0, GPU_texture_opengl_width(tex), GPU_texture_opengl_height(tex)); - GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float*)scalev); + GPU_shader_uniform_vector(blur_shader, scale_uniform, 2, 1, (float *)scalev); GPU_shader_uniform_texture(blur_shader, texture_source_uniform, blurtex); GPU_texture_bind(blurtex, 0); |