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

st/mesa: improve assertions in vp/fp translation

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2015-04-07 01:10:17 +02:00
parent 42a3c1ec84
commit aab55b0bc6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/state_tracker/st_program.c
View File

@@ -286,7 +286,8 @@ st_prepare_vertex_program(struct gl_context *ctx,
/* fall through */ /* fall through */
case VARYING_SLOT_VAR0: case VARYING_SLOT_VAR0:
default: default:
assert(attr < VARYING_SLOT_MAX); assert(attr >= VARYING_SLOT_VAR0 ||
(attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7));
stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC; stvp->output_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
stvp->output_semantic_index[slot] = stvp->output_semantic_index[slot] =
st_get_generic_varying_index(st, attr); st_get_generic_varying_index(st, attr);
@@ -663,7 +664,8 @@ st_translate_fragment_program(struct st_context *st,
* consumed for the TEXi varyings, and we can base the locations of * consumed for the TEXi varyings, and we can base the locations of
* the user varyings on VAR0. Otherwise, we use TEX0 as base index. * the user varyings on VAR0. Otherwise, we use TEX0 as base index.
*/ */
assert(attr >= VARYING_SLOT_TEX0); assert(attr >= VARYING_SLOT_VAR0 || attr == VARYING_SLOT_PNTC ||
(attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7));
input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC; input_semantic_name[slot] = TGSI_SEMANTIC_GENERIC;
input_semantic_index[slot] = st_get_generic_varying_index(st, attr); input_semantic_index[slot] = st_get_generic_varying_index(st, attr);
if (attr == VARYING_SLOT_PNTC) if (attr == VARYING_SLOT_PNTC)