summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-09-24 16:01:26 -0600
committerBrian Paul <[email protected]>2009-09-24 16:01:26 -0600
commit940ca2e837efe45caae1cf1d9665f6736347705d (patch)
tree3b37fc690165007ac57c71ebc025556c8dfe5c7e
parent726a04a2cd1bf159a6c40584b4b2b9bc5948a82e (diff)
parent1730b8db1237485778abdc4ae37e122414b5423b (diff)
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
-rw-r--r--src/gallium/drivers/softpipe/sp_screen.c2
-rw-r--r--src/mesa/main/enable.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 6178c4ac7e3..769425bd12c 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -84,7 +84,7 @@ softpipe_get_param(struct pipe_screen *screen, int param)
case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
return 13; /* max 4Kx4K */
case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
- return 8; /* max 128x128x128 */
+ return 9; /* max 256x256x256 */
case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
return 13; /* max 4Kx4K */
case PIPE_CAP_TGSI_CONT_SUPPORTED:
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 4bc54771e97..4a00440ab1c 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -234,7 +234,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);
@@ -936,11 +936,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);