blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

OpenGL: simplify basic_shader_bind 

No need to enable/disable texturing with GLSL, just use textures in the fragment shader.
This commit is contained in:
Mike Erwin 2016-09-16 18:05:00 +02:00
parent 834cb93f40
commit c3034afa58
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/gpu/intern/gpu_basic_shader.c
View File

@ -422,23 +422,6 @@ void GPU_basic_shader_bind(int options)
{
if (USE_GLSL) {
if (options) {
const int bound_options = GPU_MATERIAL_STATE.bound_options;
/* texture options need to be set for basic shader too */
if (options & GPU_SHADER_TEXTURE_2D) {
glEnable(GL_TEXTURE_2D);
}
else if (bound_options & GPU_SHADER_TEXTURE_2D) {
glDisable(GL_TEXTURE_2D);
}
if (options & GPU_SHADER_TEXTURE_RECT) {
glEnable(GL_TEXTURE_RECTANGLE);
}
else if (bound_options & GPU_SHADER_TEXTURE_RECT) {
glDisable(GL_TEXTURE_RECTANGLE);
}
GPUShader *shader = gpu_basic_shader(options);
if (shader) {