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

Merge remote branch 'origin/mesa_7_6_branch'

Browse Source 
Conflicts:
	src/mesa/drivers/dri/intel/intel_fbo.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.h
	src/mesa/drivers/dri/intel/intel_tex_copy.c
	src/mesa/drivers/dri/intel/intel_tex_image.c
This commit is contained in:
Eric Anholt
2009-10-23 14:19:52 -07:00
parent bfd51dc34d 2d17dbfb53
commit 49d402e275
19 changed files with 555 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/shader/program_parse.y
View File

@@ -1236,7 +1236,7 @@ optArraySize:
}
| INTEGER
{
if (($1 < 1) || ((unsigned) $1 >= state->limits->MaxParameters)) {
if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {
yyerror(& @1, state, "invalid parameter array size");
YYERROR;
} else {