projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_pipe.h
diff --git
a/src/gallium/auxiliary/draw/draw_pipe.h
b/src/gallium/auxiliary/draw/draw_pipe.h
index f1cb0891caa5bbb9e166d68d0ac9f1619e690358..479250729ff7ac350a38d3c2e87056a7df033d29 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_pipe.h
+++ b/
src/gallium/auxiliary/draw/draw_pipe.h
@@
-57,6
+57,7
@@
struct draw_stage
struct draw_context *draw; /**< parent context */
struct draw_stage *next; /**< next stage in pipeline */
struct draw_context *draw; /**< parent context */
struct draw_stage *next; /**< next stage in pipeline */
+ const char *name; /**< for debugging */
struct vertex_header **tmp; /**< temp vert storage, such as for clipping */
unsigned nr_tmps;
struct vertex_header **tmp; /**< temp vert storage, such as for clipping */
unsigned nr_tmps;
@@
-116,7
+117,7
@@
dup_vert( struct draw_stage *stage,
{
struct vertex_header *tmp = stage->tmp[idx];
const uint vsize = sizeof(struct vertex_header)
{
struct vertex_header *tmp = stage->tmp[idx];
const uint vsize = sizeof(struct vertex_header)
- + stage->draw->num_vs_outputs * 4 * sizeof(float);
+ + stage->draw->
vs.
num_vs_outputs * 4 * sizeof(float);
memcpy(tmp, vert, vsize);
tmp->vertex_id = UNDEFINED_VERTEX_ID;
return tmp;
memcpy(tmp, vert, vsize);
tmp->vertex_id = UNDEFINED_VERTEX_ID;
return tmp;