summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-23 18:38:43 -0600
committerBrian Paul <brianp@vmware.com>2009-10-23 18:38:43 -0600
commit46a784b7fd2dcab97c26d5ca02fb8f74945ba157 (patch)
tree28196459475a6ba99ae64be0bce53d1b83ac52c9 /src/mesa/main
parent26f1ad65b988fe55ae12a99994e4c63aaab899a0 (diff)
parentdc8b139aa23899b00baa919fd7f46c74bf4ef205 (diff)
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/fbobject.c12
-rw-r--r--src/mesa/main/imports.c4
2 files changed, 2 insertions, 14 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 85d3d3db997..0040099a69f 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1501,18 +1501,6 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
return;
}
- if (texObj && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
- /* the texture format must be depth+stencil */
- const struct gl_texture_image *texImg;
- texImg = texObj->Image[0][texObj->BaseLevel];
- if (!texImg || texImg->_BaseFormat != GL_DEPTH_STENCIL) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glFramebufferTexture%sEXT(texture is not"
- " DEPTH_STENCIL format)", caller);
- return;
- }
- }
-
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
_glthread_LOCK_MUTEX(fb->Mutex);
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 30fa55997ef..91d8d156b8f 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -934,9 +934,9 @@ _mesa_str_checksum(const char *str)
unsigned int sum, i;
const char *c;
sum = i = 1;
- for (c = str; *c; c++)
+ for (c = str; *c; c++, i++)
sum += *c * (i % 100);
- return sum;
+ return sum + i;
}