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

mesa: use STATIC_ASSERT in a few more places

Browse Source
This commit is contained in:
Brian Paul
2012-01-10 11:09:02 -07:00
parent f9b2d2fea5
commit 6bf5daf331
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/formats.c
View File

@@ -1951,7 +1951,7 @@ _mesa_test_formats(void)
{ {
GLuint i; GLuint i;
assert(Elements(format_info) == MESA_FORMAT_COUNT); STATIC_ASSERT(Elements(format_info) == MESA_FORMAT_COUNT);
for (i = 0; i < MESA_FORMAT_COUNT; i++) { for (i = 0; i < MESA_FORMAT_COUNT; i++) {
const struct gl_format_info *info = _mesa_get_format_info(i); const struct gl_format_info *info = _mesa_get_format_info(i);

2
src/mesa/main/shaderapi.c
View File

@@ -923,7 +923,7 @@ validate_samplers(const struct gl_program *prog, char *errMsg)
GLbitfield samplersUsed = prog->SamplersUsed; GLbitfield samplersUsed = prog->SamplersUsed;
GLuint i; GLuint i;
assert(Elements(targetName) == NUM_TEXTURE_TARGETS); STATIC_ASSERT(Elements(targetName) == NUM_TEXTURE_TARGETS);
if (samplersUsed == 0x0) if (samplersUsed == 0x0)
return GL_TRUE; return GL_TRUE;

2
src/mesa/main/shared.c
View File

@@ -113,7 +113,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
GL_TEXTURE_2D, GL_TEXTURE_2D,
GL_TEXTURE_1D GL_TEXTURE_1D
}; };
assert(Elements(targets) == NUM_TEXTURE_TARGETS); STATIC_ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS);
shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]); shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
} }

2
src/mesa/main/texstate.c
View File

@@ -695,7 +695,7 @@ alloc_proxy_textures( struct gl_context *ctx )
}; };
GLint tgt; GLint tgt;
ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS); STATIC_ASSERT(Elements(targets) == NUM_TEXTURE_TARGETS);
for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) { for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
if (!(ctx->Texture.ProxyTex[tgt] if (!(ctx->Texture.ProxyTex[tgt]