-/* $Id: nvvertparse.c,v 1.1 2003/01/14 04:55:46 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
* Version: 5.1
/**
* \file nvvertparse.c
- * \brief NVIDIA vertex program parser.
+ * NVIDIA vertex program parser.
* \author Brian Paul
*/
+/*
+ * Regarding GL_NV_vertex_program, GL_NV_vertex_program1_1:
+ *
+ * Portions of this software may use or implement intellectual
+ * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
+ * any and all warranties with respect to such intellectual property,
+ * including any use thereof or modifications thereto.
+ */
#include "glheader.h"
#include "context.h"
#include "nvprogram.h"
#include "nvvertparse.h"
#include "nvvertprog.h"
+#include "program.h"
-/************************ Symbol Table ******************************/
-
-/* A simple symbol table implementation for ARB_vertex_program
- * (not used yet)
+/**
+ * Current parsing state. This structure is passed among the parsing
+ * functions and keeps track of the current parser position and various
+ * program attributes.
*/
-
-#if 000
-struct symbol
-{
- GLubyte *name;
- GLint value;
- struct symbol *next;
+struct parse_state {
+ GLcontext *ctx;
+ const GLubyte *start;
+ const GLubyte *pos;
+ const GLubyte *curLine;
+ GLboolean isStateProgram;
+ GLboolean isPositionInvariant;
+ GLboolean isVersion1_1;
+ GLuint inputsRead;
+ GLuint outputsWritten;
+ GLboolean anyProgRegsWritten;
+ GLuint numInst; /* number of instructions parsed */
};
-static struct symbol *SymbolTable = NULL;
-static GLboolean
-IsSymbol(const GLubyte *symbol)
+/*
+ * Called whenever we find an error during parsing.
+ */
+static void
+record_error(struct parse_state *parseState, const char *msg, int lineNo)
{
- struct symbol *s;
- for (s = SymbolTable; s; s = s->next) {
- if (strcmp((char *) symbol, (char *)s->name) == 0)
- return GL_TRUE;
- }
- return GL_FALSE;
-}
+#ifdef DEBUG
+ GLint line, column;
+ const GLubyte *lineStr;
+ lineStr = _mesa_find_line_column(parseState->start,
+ parseState->pos, &line, &column);
+ _mesa_debug(parseState->ctx,
+ "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
+ lineNo, line, column, (char *) lineStr, msg);
+ _mesa_free((void *) lineStr);
+#else
+ (void) lineNo;
+#endif
-static GLint
-GetSymbolValue(const GLubyte *symbol)
-{
- struct symbol *s;
- for (s = SymbolTable; s; s = s->next) {
- if (strcmp((char *) symbol, (char *)s->name) == 0)
- return s->value;
+ /* Check that no error was already recorded. Only record the first one. */
+ if (parseState->ctx->Program.ErrorString[0] == 0) {
+ _mesa_set_program_error(parseState->ctx,
+ parseState->pos - parseState->start,
+ msg);
}
- return 0;
}
-static void
-AddSymbol(const GLubyte *symbol, GLint value)
-{
- struct symbol *s = MALLOC_STRUCT(symbol);
- if (s) {
- s->name = (GLubyte *) strdup((char *) symbol);
- s->value = value;
- s->next = SymbolTable;
- SymbolTable = s;
- }
-}
-static void
-ResetSymbolTable(void)
-{
- struct symbol *s, *next;
- for (s = SymbolTable; s; s = next) {
- next = s->next;
- FREE(s->name);
- FREE(s);
- s = next;
- }
- SymbolTable = NULL;
-}
-#endif
+#define RETURN_ERROR \
+do { \
+ record_error(parseState, "Unexpected end of input.", __LINE__); \
+ return GL_FALSE; \
+} while(0)
+
+#define RETURN_ERROR1(msg) \
+do { \
+ record_error(parseState, msg, __LINE__); \
+ return GL_FALSE; \
+} while(0)
+
+#define RETURN_ERROR2(msg1, msg2) \
+do { \
+ char err[1000]; \
+ _mesa_sprintf(err, "%s %s", msg1, msg2); \
+ record_error(parseState, err, __LINE__); \
+ return GL_FALSE; \
+} while(0)
+
+
-/***************************** Parsing ******************************/
static GLboolean IsLetter(GLubyte b)
* \return <= 0 we found an error, else, return number of characters parsed.
*/
static GLint
-GetToken(const GLubyte *str, GLubyte *token)
+GetToken(struct parse_state *parseState, GLubyte *token)
{
+ const GLubyte *str = parseState->pos;
GLint i = 0, j = 0;
token[0] = 0;
while (str[i] && (str[i] != '\n' && str[i] != '\r')) {
i++;
}
+ if (str[i] == '\n' || str[i] == '\r')
+ parseState->curLine = str + i + 1;
}
else {
/* skip whitespace */
+ if (str[i] == '\n' || str[i] == '\r')
+ parseState->curLine = str + i + 1;
i++;
}
}
return i;
}
- /* punctuation */
+ /* punctuation character */
if (str[i]) {
token[0] = str[i++];
token[1] = 0;
* Get next token from input stream and increment stream pointer past token.
*/
static GLboolean
-Parse_Token(const GLubyte **s, GLubyte *token)
+Parse_Token(struct parse_state *parseState, GLubyte *token)
{
GLint i;
- i = GetToken(*s, token);
+ i = GetToken(parseState, token);
if (i <= 0) {
- *s += (-i);
+ parseState->pos += (-i);
return GL_FALSE;
}
- *s += i;
+ parseState->pos += i;
return GL_TRUE;
}
* Get next token from input stream but don't increment stream pointer.
*/
static GLboolean
-Peek_Token(const GLubyte **s, GLubyte *token)
+Peek_Token(struct parse_state *parseState, GLubyte *token)
{
GLint i, len;
- i = GetToken(*s, token);
+ i = GetToken(parseState, token);
if (i <= 0) {
- *s += (-i);
+ parseState->pos += (-i);
return GL_FALSE;
}
- len = _mesa_strlen((char *) token);
- *s += (i - len);
+ len = _mesa_strlen((const char *) token);
+ parseState->pos += (i - len);
return GL_TRUE;
}
/**
- * String equality test
+ * Try to match 'pattern' as the next token after any whitespace/comments.
+ * Advance the current parsing position only if we match the pattern.
+ * \return GL_TRUE if pattern is matched, GL_FALSE otherwise.
*/
static GLboolean
-StrEq(const GLubyte *a, const GLubyte *b)
+Parse_String(struct parse_state *parseState, const char *pattern)
{
+ const GLubyte *m;
GLint i;
- for (i = 0; a[i] && b[i] && a[i] == b[i]; i++)
- ;
- if (a[i] == 0 && b[i] == 0)
- return GL_TRUE;
- else
- return GL_FALSE;
+
+ /* skip whitespace and comments */
+ while (IsWhitespace(*parseState->pos) || *parseState->pos == '#') {
+ if (*parseState->pos == '#') {
+ while (*parseState->pos && (*parseState->pos != '\n' && *parseState->pos != '\r')) {
+ parseState->pos += 1;
+ }
+ if (*parseState->pos == '\n' || *parseState->pos == '\r')
+ parseState->curLine = parseState->pos + 1;
+ }
+ else {
+ /* skip whitespace */
+ if (*parseState->pos == '\n' || *parseState->pos == '\r')
+ parseState->curLine = parseState->pos + 1;
+ parseState->pos += 1;
+ }
+ }
+
+ /* Try to match the pattern */
+ m = parseState->pos;
+ for (i = 0; pattern[i]; i++) {
+ if (*m != (GLubyte) pattern[i])
+ return GL_FALSE;
+ m += 1;
+ }
+ parseState->pos = m;
+
+ return GL_TRUE; /* success */
}
/**********************************************************************/
-static const char *InputRegisters[] = {
+static const char *InputRegisters[MAX_NV_VERTEX_PROGRAM_INPUTS + 1] = {
"OPOS", "WGHT", "NRML", "COL0", "COL1", "FOGC", "6", "7",
"TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
};
-static const char *OutputRegisters[] = {
+static const char *OutputRegisters[MAX_NV_VERTEX_PROGRAM_OUTPUTS + 1] = {
"HPOS", "COL0", "COL1", "BFC0", "BFC1", "FOGC", "PSIZ",
"TEX0", "TEX1", "TEX2", "TEX3", "TEX4", "TEX5", "TEX6", "TEX7", NULL
};
+/* NOTE: the order here must match opcodes in nvvertprog.h */
static const char *Opcodes[] = {
"MOV", "LIT", "RCP", "RSQ", "EXP", "LOG", "MUL", "ADD", "DP3", "DP4",
"DST", "MIN", "MAX", "SLT", "SGE", "MAD", "ARL", "DPH", "RCC", "SUB",
- "ABS", "END", NULL
+ "ABS", "END",
+ /* GL_ARB_vertex_program */
+ "FLR", "FRC", "EX2", "LG2", "POW", "XPD", "SWZ",
+ NULL
};
-#ifdef DEBUG
-
-#define PARSE_ERROR \
-do { \
- _mesa_printf("vpparse.c error at %d: parse error\n", __LINE__); \
- return GL_FALSE; \
-} while(0)
-
-#define PARSE_ERROR1(msg) \
-do { \
- _mesa_printf("vpparse.c error at %d: %s\n", __LINE__, msg); \
- return GL_FALSE; \
-} while(0)
-
-#define PARSE_ERROR2(msg1, msg2) \
-do { \
- _mesa_printf("vpparse.c error at %d: %s %s\n", __LINE__, msg1, msg2); \
- return GL_FALSE; \
-} while(0)
-
-#else
-
-#define PARSE_ERROR return GL_FALSE
-#define PARSE_ERROR1(msg1) return GL_FALSE
-#define PARSE_ERROR2(msg1, msg2) return GL_FALSE
-
-#endif
-
-
-static GLuint
-IsProgRegister(GLuint r)
-{
- return (GLuint) (r >= VP_PROG_REG_START && r <= VP_PROG_REG_END);
-}
-
-static GLuint
-IsInputRegister(GLuint r)
-{
- return (GLuint) (r >= VP_INPUT_REG_START && r <= VP_INPUT_REG_END);
-}
-
-static GLuint
-IsOutputRegister(GLuint r)
-{
- return (GLuint) (r >= VP_OUTPUT_REG_START && r <= VP_OUTPUT_REG_END);
-}
-
-
-
-/**********************************************************************/
-
-/* XXX
- * These shouldn't be globals as that makes the parser non-reentrant.
- * We should really define a "ParserContext" class which contains these
- * and the <s> pointer into the program text.
- */
-static GLboolean IsStateProgram = GL_FALSE;
-static GLboolean IsPositionInvariant = GL_FALSE;
-static GLboolean IsVersion1_1 = GL_FALSE;
-
-/**
- * Try to match 'pattern' as the next token after any whitespace/comments.
- */
-static GLboolean
-Parse_String(const GLubyte **s, const char *pattern)
-{
- GLint i;
-
- /* skip whitespace and comments */
- while (IsWhitespace(**s) || **s == '#') {
- if (**s == '#') {
- while (**s && (**s != '\n' && **s != '\r')) {
- *s += 1;
- }
- }
- else {
- /* skip whitespace */
- *s += 1;
- }
- }
-
- /* Try to match the pattern */
- for (i = 0; pattern[i]; i++) {
- if (**s != pattern[i])
- PARSE_ERROR2("failed to match", pattern); /* failure */
- *s += 1;
- }
-
- return GL_TRUE; /* success */
-}
-
/**
* Parse a temporary register: Rnn
*/
static GLboolean
-Parse_TempReg(const GLubyte **s, GLint *tempRegNum)
+Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
{
GLubyte token[100];
/* Should be 'R##' */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] != 'R')
- PARSE_ERROR1("Expected R##");
+ RETURN_ERROR1("Expected R##");
if (IsDigit(token[1])) {
GLint reg = _mesa_atoi((char *) (token + 1));
- if (reg >= VP_NUM_TEMP_REGS)
- PARSE_ERROR1("Bad temporary register name");
- *tempRegNum = VP_TEMP_REG_START + reg;
+ if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)
+ RETURN_ERROR1("Bad temporary register name");
+ *tempRegNum = reg;
}
else {
- PARSE_ERROR1("Bad temporary register name");
+ RETURN_ERROR1("Bad temporary register name");
}
return GL_TRUE;
* Parse address register "A0.x"
*/
static GLboolean
-Parse_AddrReg(const GLubyte **s)
+Parse_AddrReg(struct parse_state *parseState)
{
/* match 'A0' */
- if (!Parse_String(s, "A0"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "A0"))
+ RETURN_ERROR;
/* match '.' */
- if (!Parse_String(s, "."))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "."))
+ RETURN_ERROR;
/* match 'x' */
- if (!Parse_String(s, "x"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "x"))
+ RETURN_ERROR;
return GL_TRUE;
}
* Parse absolute program parameter register "c[##]"
*/
static GLboolean
-Parse_AbsParamReg(const GLubyte **s, GLint *regNum)
+Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)
{
GLubyte token[100];
- if (!Parse_String(s, "c"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "c"))
+ RETURN_ERROR;
- if (!Parse_String(s, "["))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "["))
+ RETURN_ERROR;
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
if (IsDigit(token[0])) {
/* a numbered program parameter register */
GLint reg = _mesa_atoi((char *) token);
- if (reg >= VP_NUM_PROG_REGS)
- PARSE_ERROR1("Bad constant program number");
- *regNum = VP_PROG_REG_START + reg;
+ if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
+ RETURN_ERROR1("Bad program parameter number");
+ *regNum = reg;
}
else {
- PARSE_ERROR;
+ RETURN_ERROR;
}
- if (!Parse_String(s, "]"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "]"))
+ RETURN_ERROR;
return GL_TRUE;
}
static GLboolean
-Parse_ParamReg(const GLubyte **s, struct vp_src_register *srcReg)
+Parse_ParamReg(struct parse_state *parseState, struct vp_src_register *srcReg)
{
GLubyte token[100];
- if (!Parse_String(s, "c"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "c"))
+ RETURN_ERROR;
- if (!Parse_String(s, "["))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "["))
+ RETURN_ERROR;
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (IsDigit(token[0])) {
/* a numbered program parameter register */
GLint reg;
- (void) Parse_Token(s, token);
+ (void) Parse_Token(parseState, token);
reg = _mesa_atoi((char *) token);
- if (reg >= VP_NUM_PROG_REGS)
- PARSE_ERROR1("Bad constant program number");
- srcReg->Register = VP_PROG_REG_START + reg;
+ if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
+ RETURN_ERROR1("Bad program parameter number");
+ srcReg->File = PROGRAM_ENV_PARAM;
+ srcReg->Index = reg;
}
- else if (StrEq(token, (GLubyte *) "A0")) {
+ else if (_mesa_strcmp((const char *) token, "A0") == 0) {
/* address register "A0.x" */
- if (!Parse_AddrReg(s))
- PARSE_ERROR;
+ if (!Parse_AddrReg(parseState))
+ RETURN_ERROR;
srcReg->RelAddr = GL_TRUE;
- srcReg->Register = 0;
-
+ srcReg->File = PROGRAM_ENV_PARAM;
/* Look for +/-N offset */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == '-' || token[0] == '+') {
const GLubyte sign = token[0];
- (void) Parse_Token(s, token); /* consume +/- */
+ (void) Parse_Token(parseState, token); /* consume +/- */
/* an integer should be next */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
if (IsDigit(token[0])) {
const GLint k = _mesa_atoi((char *) token);
if (sign == '-') {
if (k > 64)
- PARSE_ERROR1("Bad address offset");
- srcReg->Register = -k;
+ RETURN_ERROR1("Bad address offset");
+ srcReg->Index = -k;
}
else {
if (k > 63)
- PARSE_ERROR1("Bad address offset");
- srcReg->Register = k;
+ RETURN_ERROR1("Bad address offset");
+ srcReg->Index = k;
}
}
else {
- PARSE_ERROR;
+ RETURN_ERROR;
}
}
else {
}
}
else {
- PARSE_ERROR;
+ RETURN_ERROR;
}
/* Match closing ']' */
- if (!Parse_String(s, "]"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "]"))
+ RETURN_ERROR;
return GL_TRUE;
}
* Parse v[#] or v[<name>]
*/
static GLboolean
-Parse_AttribReg(const GLubyte **s, GLint *tempRegNum)
+Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
{
GLubyte token[100];
GLint j;
/* Match 'v' */
- if (!Parse_String(s, "v"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "v"))
+ RETURN_ERROR;
/* Match '[' */
- if (!Parse_String(s, "["))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "["))
+ RETURN_ERROR;
/* match number or named register */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
- if (IsStateProgram && token[0] != '0')
- PARSE_ERROR1("Only v[0] accessible in vertex state programs");
+ if (parseState->isStateProgram && token[0] != '0')
+ RETURN_ERROR1("Only v[0] accessible in vertex state programs");
if (IsDigit(token[0])) {
GLint reg = _mesa_atoi((char *) token);
- if (reg >= VP_NUM_INPUT_REGS)
- PARSE_ERROR1("Bad vertex attribute register name");
- *tempRegNum = VP_INPUT_REG_START + reg;
+ if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)
+ RETURN_ERROR1("Bad vertex attribute register name");
+ *tempRegNum = reg;
}
else {
for (j = 0; InputRegisters[j]; j++) {
- if (StrEq(token, (const GLubyte *) InputRegisters[j])) {
- *tempRegNum = VP_INPUT_REG_START + j;
+ if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+ *tempRegNum = j;
break;
}
}
if (!InputRegisters[j]) {
/* unknown input register label */
- PARSE_ERROR2("Bad register name", token);
+ RETURN_ERROR2("Bad register name", token);
}
}
/* Match '[' */
- if (!Parse_String(s, "]"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "]"))
+ RETURN_ERROR;
return GL_TRUE;
}
static GLboolean
-Parse_OutputReg(const GLubyte **s, GLint *outputRegNum)
+Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
{
GLubyte token[100];
GLint start, j;
/* Match 'o' */
- if (!Parse_String(s, "o"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "o"))
+ RETURN_ERROR;
/* Match '[' */
- if (!Parse_String(s, "["))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "["))
+ RETURN_ERROR;
/* Get output reg name */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
- if (IsPositionInvariant)
+ if (parseState->isPositionInvariant)
start = 1; /* skip HPOS register name */
else
start = 0;
/* try to match an output register name */
for (j = start; OutputRegisters[j]; j++) {
- if (StrEq(token, (const GLubyte *) OutputRegisters[j])) {
- *outputRegNum = VP_OUTPUT_REG_START + j;
+ if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
+ *outputRegNum = j;
break;
}
}
if (!OutputRegisters[j])
- PARSE_ERROR1("Unrecognized output register name");
+ RETURN_ERROR1("Unrecognized output register name");
/* Match ']' */
- if (!Parse_String(s, "]"))
- PARSE_ERROR1("Expected ]");
+ if (!Parse_String(parseState, "]"))
+ RETURN_ERROR1("Expected ]");
return GL_TRUE;
}
static GLboolean
-Parse_MaskedDstReg(const GLubyte **s, struct vp_dst_register *dstReg)
+Parse_MaskedDstReg(struct parse_state *parseState, struct vp_dst_register *dstReg)
{
GLubyte token[100];
/* Dst reg can be R<n> or o[n] */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == 'R') {
/* a temporary register */
- if (!Parse_TempReg(s, &dstReg->Register))
- PARSE_ERROR;
+ dstReg->File = PROGRAM_TEMPORARY;
+ if (!Parse_TempReg(parseState, &dstReg->Index))
+ RETURN_ERROR;
}
- else if (!IsStateProgram && token[0] == 'o') {
+ else if (!parseState->isStateProgram && token[0] == 'o') {
/* an output register */
- if (!Parse_OutputReg(s, &dstReg->Register))
- PARSE_ERROR;
+ dstReg->File = PROGRAM_OUTPUT;
+ if (!Parse_OutputReg(parseState, &dstReg->Index))
+ RETURN_ERROR;
}
- else if (IsStateProgram && token[0] == 'c') {
+ else if (parseState->isStateProgram && token[0] == 'c') {
/* absolute program parameter register */
- if (!Parse_AbsParamReg(s, &dstReg->Register))
- PARSE_ERROR;
+ dstReg->File = PROGRAM_ENV_PARAM;
+ if (!Parse_AbsParamReg(parseState, &dstReg->Index))
+ RETURN_ERROR;
}
else {
- PARSE_ERROR1("Bad destination register name");
+ RETURN_ERROR1("Bad destination register name");
}
/* Parse optional write mask */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == '.') {
/* got a mask */
GLint k = 0;
- if (!Parse_String(s, "."))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "."))
+ RETURN_ERROR;
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
dstReg->WriteMask[0] = GL_FALSE;
dstReg->WriteMask[1] = GL_FALSE;
k++;
}
if (k == 0) {
- PARSE_ERROR1("Bad writemask character");
+ RETURN_ERROR1("Bad writemask character");
}
return GL_TRUE;
}
static GLboolean
-Parse_SwizzleSrcReg(const GLubyte **s, struct vp_src_register *srcReg)
+Parse_SwizzleSrcReg(struct parse_state *parseState, struct vp_src_register *srcReg)
{
GLubyte token[100];
srcReg->RelAddr = GL_FALSE;
/* check for '-' */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == '-') {
- (void) Parse_String(s, "-");
+ (void) Parse_String(parseState, "-");
srcReg->Negate = GL_TRUE;
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
}
else {
srcReg->Negate = GL_FALSE;
/* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
if (token[0] == 'R') {
- if (!Parse_TempReg(s, &srcReg->Register))
- PARSE_ERROR;
+ srcReg->File = PROGRAM_TEMPORARY;
+ if (!Parse_TempReg(parseState, &srcReg->Index))
+ RETURN_ERROR;
}
else if (token[0] == 'c') {
- if (!Parse_ParamReg(s, srcReg))
- PARSE_ERROR;
+ if (!Parse_ParamReg(parseState, srcReg))
+ RETURN_ERROR;
}
else if (token[0] == 'v') {
- if (!Parse_AttribReg(s, &srcReg->Register))
- PARSE_ERROR;
+ srcReg->File = PROGRAM_INPUT;
+ if (!Parse_AttribReg(parseState, &srcReg->Index))
+ RETURN_ERROR;
}
else {
- PARSE_ERROR2("Bad source register name", token);
+ RETURN_ERROR2("Bad source register name", token);
}
/* init swizzle fields */
srcReg->Swizzle[3] = 3;
/* Look for optional swizzle suffix */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == '.') {
- (void) Parse_String(s, "."); /* consume . */
+ (void) Parse_String(parseState, "."); /* consume . */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
if (token[1] == 0) {
/* single letter swizzle */
else if (token[0] == 'w')
ASSIGN_4V(srcReg->Swizzle, 3, 3, 3, 3);
else
- PARSE_ERROR1("Expected x, y, z, or w");
+ RETURN_ERROR1("Expected x, y, z, or w");
}
else {
/* 2, 3 or 4-component swizzle */
else if (token[k] == 'w')
srcReg->Swizzle[k] = 3;
else
- PARSE_ERROR;
+ RETURN_ERROR;
}
if (k >= 5)
- PARSE_ERROR;
+ RETURN_ERROR;
}
}
static GLboolean
-Parse_ScalarSrcReg(const GLubyte **s, struct vp_src_register *srcReg)
+Parse_ScalarSrcReg(struct parse_state *parseState, struct vp_src_register *srcReg)
{
GLubyte token[100];
srcReg->RelAddr = GL_FALSE;
/* check for '-' */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == '-') {
srcReg->Negate = GL_TRUE;
- (void) Parse_String(s, "-"); /* consume '-' */
- if (!Peek_Token(s, token))
- PARSE_ERROR;
+ (void) Parse_String(parseState, "-"); /* consume '-' */
+ if (!Peek_Token(parseState, token))
+ RETURN_ERROR;
}
else {
srcReg->Negate = GL_FALSE;
/* Src reg can be R<n>, c[n], c[n +/- offset], or a named vertex attrib */
if (token[0] == 'R') {
- if (!Parse_TempReg(s, &srcReg->Register))
- PARSE_ERROR;
+ srcReg->File = PROGRAM_TEMPORARY;
+ if (!Parse_TempReg(parseState, &srcReg->Index))
+ RETURN_ERROR;
}
else if (token[0] == 'c') {
- if (!Parse_ParamReg(s, srcReg))
- PARSE_ERROR;
+ if (!Parse_ParamReg(parseState, srcReg))
+ RETURN_ERROR;
}
else if (token[0] == 'v') {
- if (!Parse_AttribReg(s, &srcReg->Register))
- PARSE_ERROR;
+ srcReg->File = PROGRAM_INPUT;
+ if (!Parse_AttribReg(parseState, &srcReg->Index))
+ RETURN_ERROR;
}
else {
- PARSE_ERROR2("Bad source register name", token);
+ RETURN_ERROR2("Bad source register name", token);
}
/* Look for .[xyzw] suffix */
- if (!Parse_String(s, "."))
- PARSE_ERROR;
+ if (!Parse_String(parseState, "."))
+ RETURN_ERROR;
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (!Parse_Token(parseState, token))
+ RETURN_ERROR;
if (token[0] == 'x' && token[1] == 0) {
srcReg->Swizzle[0] = 0;
srcReg->Swizzle[0] = 3;
}
else {
- PARSE_ERROR1("Bad scalar source suffix");
+ RETURN_ERROR1("Bad scalar source suffix");
}
srcReg->Swizzle[1] = srcReg->Swizzle[2] = srcReg->Swizzle[3] = 0;
static GLint
-Parse_UnaryOpInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_UnaryOpInstruction(struct parse_state *parseState,
+ struct vp_instruction *inst, enum vp_opcode opcode)
{
- GLubyte token[100];
-
- /* opcode */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (opcode == VP_OPCODE_ABS && !parseState->isVersion1_1)
+ RETURN_ERROR1("ABS illegal for vertex program 1.0");
- if (StrEq(token, (GLubyte *) "MOV")) {
- inst->Opcode = VP_OPCODE_MOV;
- }
- else if (StrEq(token, (GLubyte *) "LIT")) {
- inst->Opcode = VP_OPCODE_LIT;
- }
- else if (StrEq(token, (GLubyte *) "ABS") && IsVersion1_1) {
- inst->Opcode = VP_OPCODE_ABS;
- }
- else {
- PARSE_ERROR;
- }
+ inst->Opcode = opcode;
+ inst->StringPos = parseState->curLine - parseState->start;
/* dest reg */
- if (!Parse_MaskedDstReg(s, &inst->DstReg))
- PARSE_ERROR;
+ if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[0]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+ RETURN_ERROR;
/* semicolon */
- if (!Parse_String(s, ";"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ";"))
+ RETURN_ERROR;
return GL_TRUE;
}
static GLboolean
-Parse_BiOpInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_BiOpInstruction(struct parse_state *parseState,
+ struct vp_instruction *inst, enum vp_opcode opcode)
{
- GLubyte token[100];
-
- /* opcode */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (opcode == VP_OPCODE_DPH && !parseState->isVersion1_1)
+ RETURN_ERROR1("DPH illegal for vertex program 1.0");
+ if (opcode == VP_OPCODE_SUB && !parseState->isVersion1_1)
+ RETURN_ERROR1("SUB illegal for vertex program 1.0");
- if (StrEq(token, (GLubyte *) "MUL")) {
- inst->Opcode = VP_OPCODE_MUL;
- }
- else if (StrEq(token, (GLubyte *) "ADD")) {
- inst->Opcode = VP_OPCODE_ADD;
- }
- else if (StrEq(token, (GLubyte *) "DP3")) {
- inst->Opcode = VP_OPCODE_DP3;
- }
- else if (StrEq(token, (GLubyte *) "DP4")) {
- inst->Opcode = VP_OPCODE_DP4;
- }
- else if (StrEq(token, (GLubyte *) "DST")) {
- inst->Opcode = VP_OPCODE_DST;
- }
- else if (StrEq(token, (GLubyte *) "MIN")) {
- inst->Opcode = VP_OPCODE_ADD;
- }
- else if (StrEq(token, (GLubyte *) "MAX")) {
- inst->Opcode = VP_OPCODE_ADD;
- }
- else if (StrEq(token, (GLubyte *) "SLT")) {
- inst->Opcode = VP_OPCODE_SLT;
- }
- else if (StrEq(token, (GLubyte *) "SGE")) {
- inst->Opcode = VP_OPCODE_SGE;
- }
- else if (StrEq(token, (GLubyte *) "DPH") && IsVersion1_1) {
- inst->Opcode = VP_OPCODE_DPH;
- }
- else if (StrEq(token, (GLubyte *) "SUB") && IsVersion1_1) {
- inst->Opcode = VP_OPCODE_SUB;
- }
- else {
- PARSE_ERROR;
- }
+ inst->Opcode = opcode;
+ inst->StringPos = parseState->curLine - parseState->start;
/* dest reg */
- if (!Parse_MaskedDstReg(s, &inst->DstReg))
- PARSE_ERROR;
+ if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* first src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[0]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* second src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[1]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
+ RETURN_ERROR;
/* semicolon */
- if (!Parse_String(s, ";"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ";"))
+ RETURN_ERROR;
/* make sure we don't reference more than one program parameter register */
- if (IsProgRegister(inst->SrcReg[0].Register) &&
- IsProgRegister(inst->SrcReg[1].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[1].Register)
- PARSE_ERROR1("Can't reference two program parameter registers");
+ if (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[0].Index != inst->SrcReg[1].Index)
+ RETURN_ERROR1("Can't reference two program parameter registers");
/* make sure we don't reference more than one vertex attribute register */
- if (IsInputRegister(inst->SrcReg[0].Register) &&
- IsInputRegister(inst->SrcReg[1].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[1].Register)
- PARSE_ERROR1("Can't reference two vertex attribute registers");
+ if (inst->SrcReg[0].File == PROGRAM_INPUT &&
+ inst->SrcReg[1].File == PROGRAM_INPUT &&
+ inst->SrcReg[0].Index != inst->SrcReg[1].Index)
+ RETURN_ERROR1("Can't reference two vertex attribute registers");
return GL_TRUE;
}
static GLboolean
-Parse_TriOpInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_TriOpInstruction(struct parse_state *parseState,
+ struct vp_instruction *inst, enum vp_opcode opcode)
{
- GLubyte token[100];
-
- /* opcode */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
-
- if (StrEq(token, (GLubyte *) "MAD")) {
- inst->Opcode = VP_OPCODE_MAD;
- }
- else {
- PARSE_ERROR;
- }
+ inst->Opcode = opcode;
+ inst->StringPos = parseState->curLine - parseState->start;
/* dest reg */
- if (!Parse_MaskedDstReg(s, &inst->DstReg))
- PARSE_ERROR;
+ if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* first src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[0]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[0]))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* second src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[1]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[1]))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* third src arg */
- if (!Parse_SwizzleSrcReg(s, &inst->SrcReg[2]))
- PARSE_ERROR;
+ if (!Parse_SwizzleSrcReg(parseState, &inst->SrcReg[2]))
+ RETURN_ERROR;
/* semicolon */
- if (!Parse_String(s, ";"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ";"))
+ RETURN_ERROR;
/* make sure we don't reference more than one program parameter register */
- if ((IsProgRegister(inst->SrcReg[0].Register) &&
- IsProgRegister(inst->SrcReg[1].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[1].Register) ||
- (IsProgRegister(inst->SrcReg[0].Register) &&
- IsProgRegister(inst->SrcReg[2].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[2].Register) ||
- (IsProgRegister(inst->SrcReg[1].Register) &&
- IsProgRegister(inst->SrcReg[2].Register) &&
- inst->SrcReg[1].Register != inst->SrcReg[2].Register))
- PARSE_ERROR1("Can only reference one program register");
+ if ((inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
+ (inst->SrcReg[0].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
+ (inst->SrcReg[1].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[2].File == PROGRAM_ENV_PARAM &&
+ inst->SrcReg[1].Index != inst->SrcReg[2].Index))
+ RETURN_ERROR1("Can only reference one program register");
/* make sure we don't reference more than one vertex attribute register */
- if ((IsInputRegister(inst->SrcReg[0].Register) &&
- IsInputRegister(inst->SrcReg[1].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[1].Register) ||
- (IsInputRegister(inst->SrcReg[0].Register) &&
- IsInputRegister(inst->SrcReg[2].Register) &&
- inst->SrcReg[0].Register != inst->SrcReg[2].Register) ||
- (IsInputRegister(inst->SrcReg[1].Register) &&
- IsInputRegister(inst->SrcReg[2].Register) &&
- inst->SrcReg[1].Register != inst->SrcReg[2].Register))
- PARSE_ERROR1("Can only reference one input register");
+ if ((inst->SrcReg[0].File == PROGRAM_INPUT &&
+ inst->SrcReg[1].File == PROGRAM_INPUT &&
+ inst->SrcReg[0].Index != inst->SrcReg[1].Index) ||
+ (inst->SrcReg[0].File == PROGRAM_INPUT &&
+ inst->SrcReg[2].File == PROGRAM_INPUT &&
+ inst->SrcReg[0].Index != inst->SrcReg[2].Index) ||
+ (inst->SrcReg[1].File == PROGRAM_INPUT &&
+ inst->SrcReg[2].File == PROGRAM_INPUT &&
+ inst->SrcReg[1].Index != inst->SrcReg[2].Index))
+ RETURN_ERROR1("Can only reference one input register");
return GL_TRUE;
}
static GLboolean
-Parse_ScalarInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_ScalarInstruction(struct parse_state *parseState,
+ struct vp_instruction *inst, enum vp_opcode opcode)
{
- GLubyte token[100];
-
- /* opcode */
- if (!Parse_Token(s, token))
- PARSE_ERROR;
+ if (opcode == VP_OPCODE_RCC && !parseState->isVersion1_1)
+ RETURN_ERROR1("RCC illegal for vertex program 1.0");
- if (StrEq(token, (GLubyte *) "RCP")) {
- inst->Opcode = VP_OPCODE_RCP;
- }
- else if (StrEq(token, (GLubyte *) "RSQ")) {
- inst->Opcode = VP_OPCODE_RSQ;
- }
- else if (StrEq(token, (GLubyte *) "EXP")) {
- inst->Opcode = VP_OPCODE_EXP;
- }
- else if (StrEq(token, (GLubyte *) "LOG")) {
- inst->Opcode = VP_OPCODE_LOG;
- }
- else if (StrEq(token, (GLubyte *) "RCC") && IsVersion1_1) {
- inst->Opcode = VP_OPCODE_RCC;
- }
- else {
- PARSE_ERROR;
- }
+ inst->Opcode = opcode;
+ inst->StringPos = parseState->curLine - parseState->start;
/* dest reg */
- if (!Parse_MaskedDstReg(s, &inst->DstReg))
- PARSE_ERROR;
+ if (!Parse_MaskedDstReg(parseState, &inst->DstReg))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* first src arg */
- if (!Parse_ScalarSrcReg(s, &inst->SrcReg[0]))
- PARSE_ERROR;
+ if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+ RETURN_ERROR;
/* semicolon */
- if (!Parse_String(s, ";"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ";"))
+ RETURN_ERROR;
return GL_TRUE;
}
static GLboolean
-Parse_AddressInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_AddressInstruction(struct parse_state *parseState, struct vp_instruction *inst)
{
inst->Opcode = VP_OPCODE_ARL;
-
- /* opcode */
- if (!Parse_String(s, "ARL"))
- PARSE_ERROR;
+ inst->StringPos = parseState->curLine - parseState->start;
/* dest A0 reg */
- if (!Parse_AddrReg(s))
- PARSE_ERROR;
+ if (!Parse_AddrReg(parseState))
+ RETURN_ERROR;
/* comma */
- if (!Parse_String(s, ","))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ","))
+ RETURN_ERROR;
/* parse src reg */
- if (!Parse_ScalarSrcReg(s, &inst->SrcReg[0]))
- PARSE_ERROR;
+ if (!Parse_ScalarSrcReg(parseState, &inst->SrcReg[0]))
+ RETURN_ERROR;
/* semicolon */
- if (!Parse_String(s, ";"))
- PARSE_ERROR;
+ if (!Parse_String(parseState, ";"))
+ RETURN_ERROR;
return GL_TRUE;
}
static GLboolean
-Parse_EndInstruction(const GLubyte **s, struct vp_instruction *inst)
+Parse_EndInstruction(struct parse_state *parseState, struct vp_instruction *inst)
{
GLubyte token[100];
- /* opcode */
- if (!Parse_String(s, "END"))
- PARSE_ERROR;
-
inst->Opcode = VP_OPCODE_END;
+ inst->StringPos = parseState->curLine - parseState->start;
/* this should fail! */
- if (Parse_Token(s, token))
- PARSE_ERROR2("Unexpected token after END:", token);
+ if (Parse_Token(parseState, token))
+ RETURN_ERROR2("Unexpected token after END:", token);
else
return GL_TRUE;
}
static GLboolean
-Parse_OptionSequence(const GLubyte **s, struct vp_instruction program[])
+Parse_OptionSequence(struct parse_state *parseState,
+ struct vp_instruction program[])
{
while (1) {
- GLubyte token[100];
- if (!Peek_Token(s, token)) {
- PARSE_ERROR1("Unexpected end of input");
- return GL_FALSE; /* end of input */
+ if (!Parse_String(parseState, "OPTION"))
+ return GL_TRUE; /* ok, not an OPTION statement */
+ if (Parse_String(parseState, "NV_position_invariant")) {
+ parseState->isPositionInvariant = GL_TRUE;
}
-
- if (!StrEq(token, (GLubyte *) "OPTION"))
- return GL_TRUE; /* probably an instruction */
-
- Parse_Token(s, token);
-
- if (!Parse_String(s, "NV_position_invariant"))
- return GL_FALSE;
- if (!Parse_String(s, ";"))
+ else {
+ RETURN_ERROR1("unexpected OPTION statement");
+ }
+ if (!Parse_String(parseState, ";"))
return GL_FALSE;
- IsPositionInvariant = GL_TRUE;
}
}
static GLboolean
-Parse_InstructionSequence(const GLubyte **s, struct vp_instruction program[])
+Parse_InstructionSequence(struct parse_state *parseState,
+ struct vp_instruction program[])
{
- GLubyte token[100];
- GLint count = 0;
-
while (1) {
- struct vp_instruction *inst = program + count;
+ struct vp_instruction *inst = program + parseState->numInst;
/* Initialize the instruction */
- inst->SrcReg[0].Register = -1;
- inst->SrcReg[1].Register = -1;
- inst->SrcReg[2].Register = -1;
- inst->DstReg.Register = -1;
-
- if (!Peek_Token(s, token))
- PARSE_ERROR;
-
- if (StrEq(token, (GLubyte *) "MOV") ||
- StrEq(token, (GLubyte *) "LIT") ||
- StrEq(token, (GLubyte *) "ABS")) {
- if (!Parse_UnaryOpInstruction(s, inst))
- PARSE_ERROR;
+ inst->SrcReg[0].File = (enum register_file) -1;
+ inst->SrcReg[1].File = (enum register_file) -1;
+ inst->SrcReg[2].File = (enum register_file) -1;
+ inst->DstReg.File = (enum register_file) -1;
+
+ if (Parse_String(parseState, "MOV")) {
+ if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_MOV))
+ RETURN_ERROR;
}
- else if (StrEq(token, (GLubyte *) "MUL") ||
- StrEq(token, (GLubyte *) "ADD") ||
- StrEq(token, (GLubyte *) "DP3") ||
- StrEq(token, (GLubyte *) "DP4") ||
- StrEq(token, (GLubyte *) "DST") ||
- StrEq(token, (GLubyte *) "MIN") ||
- StrEq(token, (GLubyte *) "MAX") ||
- StrEq(token, (GLubyte *) "SLT") ||
- StrEq(token, (GLubyte *) "SGE") ||
- StrEq(token, (GLubyte *) "DPH") ||
- StrEq(token, (GLubyte *) "SUB")) {
- if (!Parse_BiOpInstruction(s, inst))
- PARSE_ERROR;
+ else if (Parse_String(parseState, "LIT")) {
+ if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_LIT))
+ RETURN_ERROR;
}
- else if (StrEq(token, (GLubyte *) "MAD")) {
- if (!Parse_TriOpInstruction(s, inst))
- PARSE_ERROR;
+ else if (Parse_String(parseState, "ABS")) {
+ if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_ABS))
+ RETURN_ERROR;
}
- else if (StrEq(token, (GLubyte *) "RCP") ||
- StrEq(token, (GLubyte *) "RSQ") ||
- StrEq(token, (GLubyte *) "EXP") ||
- StrEq(token, (GLubyte *) "LOG") ||
- StrEq(token, (GLubyte *) "RCC")) {
- if (!Parse_ScalarInstruction(s, inst))
- PARSE_ERROR;
+ else if (Parse_String(parseState, "MUL")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MUL))
+ RETURN_ERROR;
}
- else if (StrEq(token, (GLubyte *) "ARL")) {
- if (!Parse_AddressInstruction(s, inst))
- PARSE_ERROR;
+ else if (Parse_String(parseState, "ADD")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_ADD))
+ RETURN_ERROR;
}
- else if (StrEq(token, (GLubyte *) "END")) {
- if (!Parse_EndInstruction(s, inst))
- PARSE_ERROR;
- else
+ else if (Parse_String(parseState, "DP3")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DP3))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "DP4")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DP4))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "DST")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DST))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "MIN")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MIN))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "MAX")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_MAX))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "SLT")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SLT))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "SGE")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SGE))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "DPH")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_DPH))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "SUB")) {
+ if (!Parse_BiOpInstruction(parseState, inst, VP_OPCODE_SUB))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "MAD")) {
+ if (!Parse_TriOpInstruction(parseState, inst, VP_OPCODE_MAD))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "RCP")) {
+ if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RCP))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "RSQ")) {
+ if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RSQ))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "EXP")) {
+ if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_EXP))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "LOG")) {
+ if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_LOG))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "RCC")) {
+ if (!Parse_ScalarInstruction(parseState, inst, VP_OPCODE_RCC))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "ARL")) {
+ if (!Parse_AddressInstruction(parseState, inst))
+ RETURN_ERROR;
+ }
+ else if (Parse_String(parseState, "END")) {
+ if (!Parse_EndInstruction(parseState, inst))
+ RETURN_ERROR;
+ else {
+ parseState->numInst++;
return GL_TRUE; /* all done */
+ }
}
else {
/* bad instruction name */
- PARSE_ERROR2("Unexpected token: ", token);
+ RETURN_ERROR1("Unexpected token");
}
- count++;
- if (count >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)
- PARSE_ERROR1("Program too long");
+ /* examine input/output registers */
+ if (inst->DstReg.File == PROGRAM_OUTPUT)
+ parseState->outputsWritten |= (1 << inst->DstReg.Index);
+ else if (inst->DstReg.File == PROGRAM_ENV_PARAM)
+ parseState->anyProgRegsWritten = GL_TRUE;
+
+ if (inst->SrcReg[0].File == PROGRAM_INPUT)
+ parseState->inputsRead |= (1 << inst->SrcReg[0].Index);
+ if (inst->SrcReg[1].File == PROGRAM_INPUT)
+ parseState->inputsRead |= (1 << inst->SrcReg[1].Index);
+ if (inst->SrcReg[2].File == PROGRAM_INPUT)
+ parseState->inputsRead |= (1 << inst->SrcReg[2].Index);
+
+ parseState->numInst++;
+
+ if (parseState->numInst >= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS)
+ RETURN_ERROR1("Program too long");
}
- PARSE_ERROR;
+ RETURN_ERROR;
}
static GLboolean
-Parse_Program(const GLubyte **s, struct vp_instruction instBuffer[])
+Parse_Program(struct parse_state *parseState,
+ struct vp_instruction instBuffer[])
{
- if (IsVersion1_1) {
- if (!Parse_OptionSequence(s, instBuffer)) {
+ if (parseState->isVersion1_1) {
+ if (!Parse_OptionSequence(parseState, instBuffer)) {
return GL_FALSE;
}
}
- return Parse_InstructionSequence(s, instBuffer);
+ return Parse_InstructionSequence(parseState, instBuffer);
}
const GLubyte *str, GLsizei len,
struct vertex_program *program)
{
- const GLubyte *s;
+ struct parse_state parseState;
struct vp_instruction instBuffer[MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS];
struct vp_instruction *newInst;
GLenum target;
MEMCPY(programString, str, len);
programString[len] = 0;
- IsPositionInvariant = GL_FALSE;
- IsVersion1_1 = GL_FALSE;
+ /* Get ready to parse */
+ parseState.ctx = ctx;
+ parseState.start = programString;
+ parseState.isPositionInvariant = GL_FALSE;
+ parseState.isVersion1_1 = GL_FALSE;
+ parseState.numInst = 0;
+ parseState.inputsRead = 0;
+ parseState.outputsWritten = 0;
+ parseState.anyProgRegsWritten = GL_FALSE;
+
+ /* Reset error state */
+ _mesa_set_program_error(ctx, -1, NULL);
/* check the program header */
if (_mesa_strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
target = GL_VERTEX_PROGRAM_NV;
- s = programString + 7;
- IsStateProgram = GL_FALSE;
+ parseState.pos = programString + 7;
+ parseState.isStateProgram = GL_FALSE;
}
else if (_mesa_strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
target = GL_VERTEX_PROGRAM_NV;
- s = programString + 7;
- IsStateProgram = GL_FALSE;
- IsVersion1_1 = GL_TRUE;
+ parseState.pos = programString + 7;
+ parseState.isStateProgram = GL_FALSE;
+ parseState.isVersion1_1 = GL_TRUE;
}
else if (_mesa_strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
target = GL_VERTEX_STATE_PROGRAM_NV;
- s = programString + 8;
- IsStateProgram = GL_TRUE;
+ parseState.pos = programString + 8;
+ parseState.isStateProgram = GL_TRUE;
}
else {
/* invalid header */
return;
}
- if (Parse_Program(&s, instBuffer)) {
- GLuint numInst;
- GLuint inputsRead = 0;
- GLuint outputsWritten = 0;
- GLuint progRegsWritten = 0;
- /* Find length of the program and compute bitmasks to indicate which
- * vertex input registers are read, which vertex result registers are
- * written to, and which program registers are written to.
- * We could actually do this while we parse the program.
- */
- for (numInst = 0; instBuffer[numInst].Opcode != VP_OPCODE_END; numInst++) {
- const GLint srcReg0 = instBuffer[numInst].SrcReg[0].Register;
- const GLint srcReg1 = instBuffer[numInst].SrcReg[1].Register;
- const GLint srcReg2 = instBuffer[numInst].SrcReg[2].Register;
- const GLint dstReg = instBuffer[numInst].DstReg.Register;
-
- if (IsOutputRegister(dstReg))
- outputsWritten |= (1 << (dstReg - VP_OUTPUT_REG_START));
- else if (IsProgRegister(dstReg))
- progRegsWritten |= (1 << (dstReg - VP_PROG_REG_START));
- if (IsInputRegister(srcReg0)
- && !instBuffer[numInst].SrcReg[0].RelAddr)
- inputsRead |= (1 << (srcReg0 - VP_INPUT_REG_START));
- if (IsInputRegister(srcReg1)
- && !instBuffer[numInst].SrcReg[1].RelAddr)
- inputsRead |= (1 << (srcReg1 - VP_INPUT_REG_START));
- if (IsInputRegister(srcReg2)
- && !instBuffer[numInst].SrcReg[2].RelAddr)
- inputsRead |= (1 << (srcReg2 - VP_INPUT_REG_START));
- }
- numInst++;
+ if (Parse_Program(&parseState, instBuffer)) {
+ /* successful parse! */
- if (IsStateProgram) {
- if (progRegsWritten == 0) {
+ if (parseState.isStateProgram) {
+ if (!parseState.anyProgRegsWritten) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glLoadProgramNV(c[#] not written)");
return;
}
}
else {
- if (!IsPositionInvariant && !(outputsWritten & 1)) {
+ if (!parseState.isPositionInvariant &&
+ !(parseState.outputsWritten & 1)) {
/* bit 1 = HPOS register */
_mesa_error(ctx, GL_INVALID_OPERATION,
"glLoadProgramNV(HPOS not written)");
}
}
- program->InputsRead = inputsRead;
- program->OutputsWritten = outputsWritten;
- program->IsPositionInvariant = IsPositionInvariant;
-
/* copy the compiled instructions */
- assert(numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);
- newInst = (struct vp_instruction *) MALLOC(numInst * sizeof(struct vp_instruction));
+ assert(parseState.numInst <= MAX_NV_VERTEX_PROGRAM_INSTRUCTIONS);
+ newInst = (struct vp_instruction *)
+ MALLOC(parseState.numInst * sizeof(struct vp_instruction));
if (!newInst) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
FREE(programString);
return; /* out of memory */
}
- MEMCPY(newInst, instBuffer, numInst * sizeof(struct vp_instruction));
+ MEMCPY(newInst, instBuffer,
+ parseState.numInst * sizeof(struct vp_instruction));
/* install the program */
program->Base.Target = target;
FREE(program->Base.String);
}
program->Base.String = programString;
+ program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
if (program->Instructions) {
FREE(program->Instructions);
}
program->Instructions = newInst;
+ program->InputsRead = parseState.inputsRead;
+ program->OutputsWritten = parseState.outputsWritten;
+ program->IsPositionInvariant = parseState.isPositionInvariant;
-#ifdef DEBUG_foo
+#ifdef DEBUG
_mesa_printf("--- glLoadProgramNV result ---\n");
_mesa_print_nv_vertex_program(program);
_mesa_printf("------------------------------\n");
}
else {
/* Error! */
-#ifdef DEBUG
- /* print a message showing the program line containing the error */
- ctx->Program.ErrorPos = s - str;
- {
- const GLubyte *p = str, *line = str;
- int lineNum = 1, statementNum = 1, column = 0;
- char errorLine[1000];
- int i;
- while (*p && p < s) { /* s is the error position */
- if (*p == '\n') {
- line = p + 1;
- lineNum++;
- column = 0;
- }
- else if (*p == ';') {
- statementNum++;
- }
- else
- column++;
- p++;
- }
- if (p) {
- /* Copy the line with the error into errorLine so we can null-
- * terminate it.
- */
- for (i = 0; line[i] != '\n' && line[i]; i++)
- errorLine[i] = (char) line[i];
- errorLine[i] = 0;
- }
- /*
- _mesa_debug("Error pos = %d (%c) col %d\n",
- ctx->Program.ErrorPos, *s, column);
- */
- _mesa_debug(ctx, "Vertex program error on line %2d: %s\n", lineNum, errorLine);
- _mesa_debug(ctx, " (statement %2d) near column %2d: ", statementNum, column+1);
- for (i = 0; i < column; i++)
- _mesa_debug(ctx, " ");
- _mesa_debug(ctx, "^\n");
- }
-#endif
_mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV");
+ /* NOTE: _mesa_set_program_error would have been called already */
+ /* GL_NV_vertex_program isn't supposed to set the error string
+ * so we reset it here.
+ */
+ _mesa_set_program_error(ctx, ctx->Program.ErrorPos, NULL);
}
}
if (src->Negate)
_mesa_printf("-");
if (src->RelAddr) {
- if (src->Register > 0)
- _mesa_printf("c[A0.x + %d]", src->Register);
- else if (src->Register < 0)
- _mesa_printf("c[A0.x - %d]", -src->Register);
+ if (src->Index > 0)
+ _mesa_printf("c[A0.x + %d]", src->Index);
+ else if (src->Index < 0)
+ _mesa_printf("c[A0.x - %d]", -src->Index);
else
_mesa_printf("c[A0.x]");
}
- else if (src->Register >= VP_OUTPUT_REG_START
- && src->Register <= VP_OUTPUT_REG_END) {
- _mesa_printf("o[%s]", OutputRegisters[src->Register - VP_OUTPUT_REG_START]);
+ else if (src->File == PROGRAM_OUTPUT) {
+ _mesa_printf("o[%s]", OutputRegisters[src->Index]);
}
- else if (src->Register >= VP_INPUT_REG_START
- && src->Register <= VP_INPUT_REG_END) {
- _mesa_printf("v[%s]", InputRegisters[src->Register - VP_INPUT_REG_START]);
+ else if (src->File == PROGRAM_INPUT) {
+ _mesa_printf("v[%s]", InputRegisters[src->Index]);
}
- else if (src->Register >= VP_PROG_REG_START
- && src->Register <= VP_PROG_REG_END) {
- _mesa_printf("c[%d]", src->Register - VP_PROG_REG_START);
+ else if (src->File == PROGRAM_ENV_PARAM) {
+ _mesa_printf("c[%d]", src->Index);
}
else {
- _mesa_printf("R%d", src->Register - VP_TEMP_REG_START);
+ ASSERT(src->File == PROGRAM_TEMPORARY);
+ _mesa_printf("R%d", src->Index);
}
if (src->Swizzle[0] == src->Swizzle[1] &&
GLint w = dst->WriteMask[0] + dst->WriteMask[1]
+ dst->WriteMask[2] + dst->WriteMask[3];
- if (dst->Register >= VP_OUTPUT_REG_START
- && dst->Register <= VP_OUTPUT_REG_END) {
- _mesa_printf("o[%s]", OutputRegisters[dst->Register - VP_OUTPUT_REG_START]);
+ if (dst->File == PROGRAM_OUTPUT) {
+ _mesa_printf("o[%s]", OutputRegisters[dst->Index]);
}
- else if (dst->Register >= VP_INPUT_REG_START
- && dst->Register <= VP_INPUT_REG_END) {
- _mesa_printf("v[%s]", InputRegisters[dst->Register - VP_INPUT_REG_START]);
+ else if (dst->File == PROGRAM_INPUT) {
+ _mesa_printf("v[%s]", InputRegisters[dst->Index]);
}
- else if (dst->Register >= VP_PROG_REG_START
- && dst->Register <= VP_PROG_REG_END) {
- _mesa_printf("c[%d]", dst->Register - VP_PROG_REG_START);
+ else if (dst->File == PROGRAM_ENV_PARAM) {
+ _mesa_printf("c[%d]", dst->Index);
}
else {
- _mesa_printf("R%d", dst->Register - VP_TEMP_REG_START);
+ ASSERT(dst->File == PROGRAM_TEMPORARY);
+ _mesa_printf("R%d", dst->Index);
}
if (w != 0 && w != 4) {
/**
- * Print (unparse) the given vertex program. Just for debugging.
+ * Print a single NVIDIA vertex program instruction.
*/
void
-_mesa_print_nv_vertex_program(const struct vertex_program *program)
+_mesa_print_nv_vertex_instruction(const struct vp_instruction *inst)
{
- const struct vp_instruction *inst;
-
- for (inst = program->Instructions; ; inst++) {
- switch (inst->Opcode) {
+ switch (inst->Opcode) {
case VP_OPCODE_MOV:
case VP_OPCODE_LIT:
case VP_OPCODE_RCP:
break;
case VP_OPCODE_END:
_mesa_printf("END\n");
- return;
+ break;
default:
_mesa_printf("BAD INSTRUCTION\n");
- }
}
}
+
+/**
+ * Print (unparse) the given vertex program. Just for debugging.
+ */
+void
+_mesa_print_nv_vertex_program(const struct vertex_program *program)
+{
+ const struct vp_instruction *inst;
+
+ for (inst = program->Instructions; ; inst++) {
+ _mesa_print_nv_vertex_instruction(inst);
+ if (inst->Opcode == VP_OPCODE_END)
+ return;
+ }
+}
+
+
+const char *
+_mesa_nv_vertex_input_register_name(GLuint i)
+{
+ ASSERT(i < MAX_NV_VERTEX_PROGRAM_INPUTS);
+ return InputRegisters[i];
+}
+
+
+const char *
+_mesa_nv_vertex_output_register_name(GLuint i)
+{
+ ASSERT(i < MAX_NV_VERTEX_PROGRAM_OUTPUTS);
+ return OutputRegisters[i];
+}