projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i965g-restart'
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_rasterpos.c
diff --git
a/src/mesa/state_tracker/st_cb_rasterpos.c
b/src/mesa/state_tracker/st_cb_rasterpos.c
index 3eaccb74e17fff4b1697734a816d2b7ebdbafbab..d82b2a2035f4a62f4c4dfbe4935f4ee9157c8977 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/
src/mesa/state_tracker/st_cb_rasterpos.c
@@
-102,7
+102,7
@@
rastpos_line( struct draw_stage *stage, struct prim_header *prim )
static void
rastpos_destroy(struct draw_stage *stage)
{
static void
rastpos_destroy(struct draw_stage *stage)
{
- free(stage);
+
_mesa_
free(stage);
}
}
@@
-162,7
+162,7
@@
rastpos_point(struct draw_stage *stage, struct prim_header *prim)
ctx->Current.RasterSecondaryColor,
VERT_RESULT_COL1, VERT_ATTRIB_COLOR1);
ctx->Current.RasterSecondaryColor,
VERT_RESULT_COL1, VERT_ATTRIB_COLOR1);
- for (i = 0; i <
MAX_TEXTURE_UNITS
; i++) {
+ for (i = 0; i <
ctx->Const.MaxTextureCoordUnits
; i++) {
update_attrib(ctx, outputMapping, prim->v[0],
ctx->Current.RasterTexCoords[i],
VERT_RESULT_TEX0 + i, VERT_ATTRIB_TEX0 + i);
update_attrib(ctx, outputMapping, prim->v[0],
ctx->Current.RasterTexCoords[i],
VERT_RESULT_TEX0 + i, VERT_ATTRIB_TEX0 + i);
@@
-180,7
+180,7
@@
rastpos_point(struct draw_stage *stage, struct prim_header *prim)
static struct rastpos_stage *
new_draw_rastpos_stage(GLcontext *ctx, struct draw_context *draw)
{
static struct rastpos_stage *
new_draw_rastpos_stage(GLcontext *ctx, struct draw_context *draw)
{
- struct rastpos_stage *rs = CALLOC_STRUCT(rastpos_stage);
+ struct rastpos_stage *rs =
ST_
CALLOC_STRUCT(rastpos_stage);
GLuint i;
rs->stage.draw = draw;
GLuint i;
rs->stage.draw = draw;
@@
-194,9
+194,10
@@
new_draw_rastpos_stage(GLcontext *ctx, struct draw_context *draw)
rs->stage.destroy = rastpos_destroy;
rs->ctx = ctx;
rs->stage.destroy = rastpos_destroy;
rs->ctx = ctx;
- for (i = 0; i <
VERT_ATTRIB_MAX
; i++) {
+ for (i = 0; i <
Elements(rs->array)
; i++) {
rs->array[i].Size = 4;
rs->array[i].Type = GL_FLOAT;
rs->array[i].Size = 4;
rs->array[i].Type = GL_FLOAT;
+ rs->array[i].Format = GL_RGBA;
rs->array[i].Stride = 0;
rs->array[i].StrideB = 0;
rs->array[i].Ptr = (GLubyte *) ctx->Current.Attrib[i];
rs->array[i].Stride = 0;
rs->array[i].StrideB = 0;
rs->array[i].Ptr = (GLubyte *) ctx->Current.Attrib[i];
@@
-250,7
+251,7
@@
st_RasterPos(GLcontext *ctx, const GLfloat v[4])
rs->array[0].Ptr = (GLubyte *) v;
/* draw the point */
rs->array[0].Ptr = (GLubyte *) v;
/* draw the point */
- st_feedback_draw_vbo(ctx, rs->arrays, &rs->prim, 1, NULL, 0, 1);
+ st_feedback_draw_vbo(ctx, rs->arrays, &rs->prim, 1, NULL,
GL_TRUE,
0, 1);
}
}