OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mesa_7_6_branch'

Browse Source
This commit is contained in:
Brian Paul
2009-10-23 18:38:43 -06:00
parent 26f1ad65b9 dc8b139aa2
commit 46a784b7fd
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/main/fbobject.c
View File

@@ -1501,18 +1501,6 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
return; 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); FLUSH_CURRENT(ctx, _NEW_BUFFERS);
_glthread_LOCK_MUTEX(fb->Mutex); _glthread_LOCK_MUTEX(fb->Mutex);

4
src/mesa/main/imports.c
View File

@@ -934,9 +934,9 @@ _mesa_str_checksum(const char *str)
unsigned int sum, i; unsigned int sum, i;
const char *c; const char *c;
sum = i = 1; sum = i = 1;
for (c = str; *c; c++) for (c = str; *c; c++, i++)
sum += *c * (i % 100); sum += *c * (i % 100);
return sum; return sum + i;
} }