projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1141c3f
)
glsl_to_tgsi: fix compile error with g++ 4.6
author
Bryan Cain
<bryancain3@gmail.com>
Thu, 16 Jun 2011 18:42:57 +0000
(13:42 -0500)
committer
Bryan Cain
<bryancain3@gmail.com>
Mon, 1 Aug 2011 22:59:08 +0000
(17:59 -0500)
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index
5fedf26
..
6c92441
100644
(file)
--- a/
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@
-389,7
+389,7
@@
public:
void *mem_ctx;
};
-static st_src_reg undef_src = st_src_reg(PROGRAM_UNDEFINED, 0,
NULL
);
+static st_src_reg undef_src = st_src_reg(PROGRAM_UNDEFINED, 0,
GLSL_TYPE_ERROR
);
static st_dst_reg undef_dst = st_dst_reg(PROGRAM_UNDEFINED, SWIZZLE_NOOP, GLSL_TYPE_ERROR);