diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 08:49:25 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-27 08:49:25 +0300 |
| commit | ebdff8c3b8b2d0c61c5419d2a71504fcc3cb5d5a (patch) | |
| tree | 9727872459aa2ba0980218cd50659ef289b51f29 | |
| parent | 8f620f2e85d4996c8cdc1c118c24bbdbec4cf2da (diff) | |
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)
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index f5d5af3f373..fb246aa802e 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -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) |