diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
| commit | 29d27229a95837d085db785a2b4abb654457dafa (patch) | |
| tree | 0a03c9dbe3e55fa9676137750da1ee465379b978 /src/mesa/main/enable.c | |
| parent | fd56bee6c4de28da194333f93b52c40f1deb6163 (diff) | |
| parent | 940ca2e837efe45caae1cf1d9665f6736347705d (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 4c1f46102d..8e6b01f73b 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -233,7 +233,7 @@ enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit) const GLbitfield newenabled = state ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit); - if (!ctx->DrawBuffer->Visual.rgbMode || texUnit->Enabled == newenabled) + if (texUnit->Enabled == newenabled) return GL_FALSE; FLUSH_VERTICES(ctx, _NEW_TEXTURE); @@ -935,11 +935,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state) /* GL_EXT_depth_bounds_test */ case GL_DEPTH_BOUNDS_TEST_EXT: CHECK_EXTENSION(EXT_depth_bounds_test, cap); - if (state && ctx->DrawBuffer->Visual.depthBits == 0) { - _mesa_warning(ctx, - "glEnable(GL_DEPTH_BOUNDS_TEST_EXT) but no depth buffer"); - return; - } if (ctx->Depth.BoundsTest == state) return; FLUSH_VERTICES(ctx, _NEW_DEPTH); |