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

OpenGL: simplify initial state 

Client vertex array state is deprecated, and these are the default values anyway.

No need to bind any basic shader. Let drawing code decide which shader it wants to use.

Part of T49165 (general OpenGL upgrade)
This commit is contained in:
Mike Erwin 2017-03-27 01:49:25 -04:00
parent 8f620f2e85
commit ebdff8c3b8
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/gpu/intern/gpu_draw.c
View File

@ -2277,12 +2277,6 @@ void GPU_state_init(void)
glDisable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
/* default disabled, enable should be local per function */
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_NORMAL_ARRAY);
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glDepthRange(0.0, 1.0);
glMatrixMode(GL_TEXTURE);
@ -2294,8 +2288,6 @@ void GPU_state_init(void)
glDisable(GL_CULL_FACE);
gpu_multisample(false);
GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
}
void GPU_enable_program_point_size(void)