projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: glsl: fix error detection of writing to read-only variables
[mesa.git]
/
src
/
mesa
/
shader
/
nvvertparse.c
diff --git
a/src/mesa/shader/nvvertparse.c
b/src/mesa/shader/nvvertparse.c
index fb546a0217b2c1fab0e581185988358432a14559..08538c0ee4fbec8907de60dff6063d3868f60cf4 100644
(file)
--- a/
src/mesa/shader/nvvertparse.c
+++ b/
src/mesa/shader/nvvertparse.c
@@
-37,10
+37,10
@@
* including any use thereof or modifications thereto.
*/
* including any use thereof or modifications thereto.
*/
-#include "glheader.h"
-#include "context.h"
-#include "imports.h"
-#include "macros.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "
main/
imports.h"
+#include "ma
in/ma
cros.h"
#include "nvprogram.h"
#include "nvvertparse.h"
#include "prog_instruction.h"
#include "nvprogram.h"
#include "nvvertparse.h"
#include "prog_instruction.h"
@@
-684,13
+684,13
@@
Parse_SwizzleSrcReg(struct parse_state *parseState, struct prog_src_register *sr
if (token[1] == 0) {
/* single letter swizzle */
if (token[0] == 'x')
if (token[1] == 0) {
/* single letter swizzle */
if (token[0] == 'x')
- srcReg->Swizzle =
MAKE_SWIZZLE4(0, 0, 0, 0)
;
+ srcReg->Swizzle =
SWIZZLE_XXXX
;
else if (token[0] == 'y')
else if (token[0] == 'y')
- srcReg->Swizzle =
MAKE_SWIZZLE4(1, 1, 1, 1)
;
+ srcReg->Swizzle =
SWIZZLE_YYYY
;
else if (token[0] == 'z')
else if (token[0] == 'z')
- srcReg->Swizzle =
MAKE_SWIZZLE4(2, 2, 2, 2)
;
+ srcReg->Swizzle =
SWIZZLE_ZZZZ
;
else if (token[0] == 'w')
else if (token[0] == 'w')
- srcReg->Swizzle =
MAKE_SWIZZLE4(3, 3, 3, 3)
;
+ srcReg->Swizzle =
SWIZZLE_WWWW
;
else
RETURN_ERROR1("Expected x, y, z, or w");
}
else
RETURN_ERROR1("Expected x, y, z, or w");
}
@@
-1378,8
+1378,7
@@
_mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
_mesa_free(programString);
return; /* out of memory */
}
_mesa_free(programString);
return; /* out of memory */
}
- _mesa_memcpy(newInst, instBuffer,
- parseState.numInst * sizeof(struct prog_instruction));
+ _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
/* install the program */
program->Base.Target = target;
/* install the program */
program->Base.Target = target;