KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: Remove draw_arrays() and draw_arrays_instanced() functions 

Moved draw_arrays() to st_draw_feedback.c and removed draw_arrays_instanced().
draw_arrays() was used by nobody else.  Now there's just one "draw" entrypoint
into the draw module.

Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Arnas Milasevicius 2013-06-07 01:21:19 +03:00 committed by Brian Paul
parent 14541dacab
commit 3069357ef0
3 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/auxiliary/draw/draw_context.h
View File

@ -241,17 +241,6 @@ draw_set_mapped_so_targets(struct draw_context *draw,
void draw_vbo(struct draw_context *draw,
const struct pipe_draw_info *info);
void draw_arrays(struct draw_context *draw, unsigned prim,
unsigned start, unsigned count);
void
draw_arrays_instanced(struct draw_context *draw,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount);
/*******************************************************************************
* Driver backend interface

40
src/gallium/auxiliary/draw/draw_pt.c
View File

@ -413,46 +413,6 @@ draw_pt_arrays_restart(struct draw_context *draw,
}
/**
* Non-instanced drawing.
* \sa draw_arrays_instanced
*/
void
draw_arrays(struct draw_context *draw, unsigned prim,
unsigned start, unsigned count)
{
draw_arrays_instanced(draw, prim, start, count, 0, 1);
}
/**
* Instanced drawing.
* \sa draw_vbo
*/
void
draw_arrays_instanced(struct draw_context *draw,
unsigned mode,
unsigned start,
unsigned count,
unsigned startInstance,
unsigned instanceCount)
{
struct pipe_draw_info info;
util_draw_init_info(&info);
info.mode = mode;
info.start = start;
info.count = count;
info.start_instance = startInstance;
info.instance_count = instanceCount;
info.min_index = start;
info.max_index = start + count - 1;
draw_vbo(draw, &info);
}
/**
* Resolve true values within pipe_draw_info.
* If we're rendering from transform feedback/stream output

22
src/mesa/state_tracker/st_draw_feedback.c
View File

@ -40,6 +40,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "util/u_inlines.h"
#include "util/u_draw.h"
#include "draw/draw_private.h"
#include "draw/draw_context.h"
@ -80,6 +81,27 @@ set_feedback_vertex_format(struct gl_context *ctx)
}
/**
* Helper for drawing current vertex arrays.
*/
static void
draw_arrays(struct draw_context *draw, unsigned mode,
unsigned start, unsigned count)
{
struct pipe_draw_info info;
util_draw_init_info(&info);
info.mode = mode;
info.start = start;
info.count = count;
info.min_index = start;
info.max_index = start + count - 1;
draw_vbo(draw, &info);
}
/**
* Called by VBO to draw arrays when in selection or feedback mode and
* to implement glRasterPos.