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:
authorMike Erwin <significant.bit@gmail.com>2015-12-07 02:26:10 +0300
committerMike Erwin <significant.bit@gmail.com>2015-12-07 02:26:10 +0300
commit50df05c35cca2f26f613f3d44dd3175852da2f78 (patch)
treea6a1f95c89e9884a0fa3a9a804e2fb48ac279ce6
parent8cfcc444c63fc6346f70899d593c3adaf1f4c748 (diff)
OpenGL: remove old version check
+ minor cleanup
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 4f3b84ced24..6410418615a 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -312,7 +312,6 @@ bool GPU_bicubic_bump_support(void)
return GLEW_VERSION_4_0 || (GLEW_ARB_texture_query_lod && GLEW_VERSION_3_0);
}
-
bool GPU_geometry_shader_support(void)
{
/* in GL 3.2 geometry shaders are fully supported
@@ -584,9 +583,6 @@ GPUTexture *GPU_texture_create_3D(int w, int h, int depth, int channels, const f
int r_width;
bool rescale = false;
- if (!GLEW_VERSION_1_2)
- return NULL;
-
tex = MEM_callocN(sizeof(GPUTexture), "GPUTexture");
tex->w = tex->w_orig = w;
tex->h = tex->h_orig = h;
@@ -805,7 +801,6 @@ GPUTexture *GPU_texture_from_preview(PreviewImage *prv, int mipmap)
glBindTexture(GL_TEXTURE_2D, 0);
return tex;
-
}
GPUTexture *GPU_texture_create_1D(int w, const float *fpixels, char err_out[256])
@@ -2136,7 +2131,7 @@ void GPU_shader_uniform_texture(GPUShader *UNUSED(shader), int location, GPUText
fprintf(stderr, "Not enough texture slots.\n");
return;
}
-
+
if (tex->number == -1)
return;