From: Brian Paul Date: Mon, 7 Apr 2003 23:12:00 +0000 (+0000) Subject: scalar source reg can be a scalar or vector literal X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8ca0172e7562f2ed92ef99903980aae2e806a94;p=mesa.git scalar source reg can be a scalar or vector literal --- diff --git a/src/mesa/main/nvfragparse.c b/src/mesa/main/nvfragparse.c index 725415ad854..5178dfd8d2b 100644 --- a/src/mesa/main/nvfragparse.c +++ b/src/mesa/main/nvfragparse.c @@ -1,4 +1,4 @@ -/* $Id: nvfragparse.c,v 1.18 2003/04/07 14:58:58 brianp Exp $ */ +/* $Id: nvfragparse.c,v 1.19 2003/04/07 23:12:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1217,6 +1217,16 @@ Parse_ScalarSrcReg(struct parse_state *parseState, if (!Parse_FragReg(parseState, &srcReg->Register)) RETURN_ERROR; } + else if (token[0] == '{') { + /* vector literal */ + GLfloat values[4]; + GLuint paramIndex; + if (!Parse_VectorOrScalarConstant(parseState, values)) + RETURN_ERROR; + paramIndex = add_unnamed_constant(parseState, values); + srcReg->IsParameter = GL_TRUE; + srcReg->Register = paramIndex; + } else { RETURN_ERROR2("Invalid source register name", token); }