From 76eefcc70cc62db7d226591de3f918ff102f6de3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 11 Apr 2012 15:51:13 +0200 Subject: [PATCH] cso: add set_index_buffer and draw_vbo passthrough functions v2: use util_draw_init_info Reviewed-by: Brian Paul --- src/gallium/auxiliary/cso_cache/cso_context.c | 35 +++++++++++++++++++ src/gallium/auxiliary/cso_cache/cso_context.h | 13 +++++++ 2 files changed, 48 insertions(+) diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 43b834314dc..9ec7a2a9676 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -36,6 +36,7 @@ */ #include "pipe/p_state.h" +#include "util/u_draw.h" #include "util/u_framebuffer.h" #include "util/u_inlines.h" #include "util/u_math.h" @@ -1290,3 +1291,37 @@ cso_restore_stream_outputs(struct cso_context *ctx) ctx->nr_so_targets = ctx->nr_so_targets_saved; ctx->nr_so_targets_saved = 0; } + +/* drawing */ + +void +cso_set_index_buffer(struct cso_context *cso, + const struct pipe_index_buffer *ib) +{ + struct pipe_context *pipe = cso->pipe; + pipe->set_index_buffer(pipe, ib); +} + +void +cso_draw_vbo(struct cso_context *cso, + const struct pipe_draw_info *info) +{ + struct pipe_context *pipe = cso->pipe; + pipe->draw_vbo(pipe, info); +} + +void +cso_draw_arrays(struct cso_context *cso, uint mode, uint start, uint 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; + + cso_draw_vbo(cso, &info); +} diff --git a/src/gallium/auxiliary/cso_cache/cso_context.h b/src/gallium/auxiliary/cso_cache/cso_context.h index 8cc1bbf9de7..d0f8bc29550 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.h +++ b/src/gallium/auxiliary/cso_cache/cso_context.h @@ -217,6 +217,19 @@ cso_save_vertex_sampler_views(struct cso_context *cso); void cso_restore_vertex_sampler_views(struct cso_context *cso); +/* drawing */ + +void +cso_set_index_buffer(struct cso_context *cso, + const struct pipe_index_buffer *ib); + +void +cso_draw_vbo(struct cso_context *cso, + const struct pipe_draw_info *info); + +/* helper drawing function */ +void +cso_draw_arrays(struct cso_context *cso, uint mode, uint start, uint count); #ifdef __cplusplus } -- 2.30.2