fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

added pipe ptr to draw_context

Browse source
This commit is contained in:
Brian 2007-08-17 12:19:40 -06:00
parent e3647578d1
commit a30939714c
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/pipe/draw/draw_private.h
View file

@ -161,6 +161,8 @@ struct draw_context
const struct pipe_vertex_buffer *vertex_buffer; /**< note: pointer */
const struct pipe_vertex_element *vertex_element; /**< note: pointer */
/** need to know the pipe for vertex flushing/transformation: */
struct pipe_context *pipe;
/* Clip derived state:
*/

10
src/mesa/pipe/softpipe/sp_draw_arrays.c
View file

@ -61,9 +61,6 @@
#endif
static struct softpipe_context *sp_global = NULL;
static INLINE unsigned
compute_clipmask(float cx, float cy, float cz, float cw)
@ -104,9 +101,7 @@ run_vertex_program(struct draw_context *draw,
const void *vbuffer, unsigned elts[4], unsigned count,
struct vertex_header *vOut[])
{
#if 1
struct softpipe_context *sp = sp_global;
#endif
struct softpipe_context *sp = softpipe_context(draw->pipe);
struct tgsi_exec_machine machine;
unsigned int j;
@ -368,8 +363,6 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
struct draw_context *draw = sp->draw;
struct pipe_buffer_handle *buf;
sp_global = sp;
softpipe_map_surfaces(sp);
/*
@ -384,6 +377,7 @@ softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
draw->pipeline.first->begin( draw->pipeline.first );
draw->vs_flush = vs_flush;
draw->pipe = pipe; /* XXX pass pipe to draw_create() */
draw_invalidate_vcache( draw );