[Mesa-dev] [PATCH 2/3] gallium/auxiliary/indices: add u_primconvert
Brian Paul
brianp at vmware.com
Mon Oct 28 16:30:59 CET 2013
Just a bunch of minor nits...
On 10/25/2013 01:53 PM, Rob Clark wrote:
> From: Rob Clark <robclark at freedesktop.org>
>
> A convenient front end to indices generate/translate code, for emulating
> primitives which are not supported natively by the driver.
>
> This handles saving/restoring index buffer state, etc.
>
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> ---
> src/gallium/auxiliary/Makefile.sources | 1 +
> src/gallium/auxiliary/indices/u_primconvert.c | 171 ++++++++++++++++++++++++++
> src/gallium/auxiliary/indices/u_primconvert.h | 46 +++++++
> 3 files changed, 218 insertions(+)
> create mode 100644 src/gallium/auxiliary/indices/u_primconvert.c
> create mode 100644 src/gallium/auxiliary/indices/u_primconvert.h
>
> diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
> index acbcef7..c89cbdd 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -43,6 +43,7 @@ C_SOURCES := \
> hud/hud_cpu.c \
> hud/hud_fps.c \
> hud/hud_driver_query.c \
> + indices/u_primconvert.c \
> os/os_misc.c \
> os/os_process.c \
> os/os_time.c \
> diff --git a/src/gallium/auxiliary/indices/u_primconvert.c b/src/gallium/auxiliary/indices/u_primconvert.c
> new file mode 100644
> index 0000000..f7cf349
> --- /dev/null
> +++ b/src/gallium/auxiliary/indices/u_primconvert.c
> @@ -0,0 +1,171 @@
> +/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
This isn't consistent with the formatting for the bulk of gallium
(drivers vary). We generally use 3-space indentation.
> +
> +/*
> + * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + *
> + * Authors:
> + * Rob Clark <robclark at freedesktop.org>
> + */
> +
> +/**
> + * This module converts provides a more convenient front-end to u_indices,
> + * etc, utils to convert primitive types supported not supported by the
> + * hardware. It handles binding new index buffer state, and restoring
> + * previous state after. To use, put something like this at the front of
> + * drivers pipe->draw_vbo():
> + *
> + * // emulate unsupported primitives:
> + * if (info->mode needs emulating) {
> + * util_primconvert_save_index_buffer(ctx->primconvert, &ctx->indexbuf);
> + * util_primconvert_save_rasterizer_state(ctx->primconvert, ctx->rasterizer);
> + * util_primconvert_draw_vbo(ctx->primconvert, info);
> + * return;
> + * }
> + *
> + */
> +
> +#include "pipe/p_state.h"
> +#include "util/u_memory.h"
> +#include "util/u_inlines.h"
> +
> +#include "indices/u_primconvert.h"
> +#include "indices/u_indices.h"
> +
> +struct primconvert_context {
> + struct pipe_context *pipe;
> + struct pipe_index_buffer saved_ib;
> + uint32_t primtypes_mask;
> + unsigned api_pv;
> + // TODO we could cache/recycle the indexbuf created to translate prims..
> +};
> +
> +
> +struct primconvert_context *util_primconvert_create(struct pipe_context *pipe,
> + uint32_t primtypes_mask)
This should be formatted as:
struct primconvert_context *
util_primconvert_create(struct pipe_context *pipe, uint32_t primtypes_mask)
> +{
> + struct primconvert_context *pc = CALLOC_STRUCT(primconvert_context);
> + if (!pc)
> + return NULL;
> + pc->pipe = pipe;
> + pc->primtypes_mask = primtypes_mask;
> + return pc;
> +}
> +
> +void util_primconvert_destroy(struct primconvert_context *pc)
> +{
> + util_primconvert_save_index_buffer(pc, NULL);
> + free(pc);
> +}
> +
> +void util_primconvert_save_index_buffer(struct primconvert_context *pc,
> + const struct pipe_index_buffer *ib)
> +{
> + if (ib) {
> + pipe_resource_reference(&pc->saved_ib.buffer, ib->buffer);
> + pc->saved_ib.index_size = ib->index_size;
> + pc->saved_ib.offset = ib->offset;
> + pc->saved_ib.user_buffer = ib->user_buffer;
> + } else {
> + pipe_resource_reference(&pc->saved_ib.buffer, NULL);
> + }
> +}
> +
> +void util_primconvert_save_rasterizer_state(struct primconvert_context *pc,
> + const struct pipe_rasterizer_state *rast)
> +{
> + /* if we actually translated the provoking vertex for the buffer,
> + * we would actually need to save/restore rasterizer state. As
> + * it is, we just need to make note of the pv.
> + */
> + pc->api_pv = (rast->flatshade && !rast->flatshade_first) ? PV_LAST : PV_FIRST;
> +}
> +
> +void util_primconvert_draw_vbo(struct primconvert_context *pc,
> + const struct pipe_draw_info *info)
> +{
> + struct pipe_index_buffer *ib = &pc->saved_ib;
> + struct pipe_index_buffer new_ib = {
> + .offset = 0,
> + };
IIRC, this won't work with MSVC. Just use ordinary assignments to
initialize the struct object.
> + struct pipe_draw_info new_info = {
> + .start = 0,
> + .indexed = true,
> + };
There's a util_draw_init_info() function that you should probably use.
> + struct pipe_transfer *src_transfer = NULL, *dst_transfer = NULL;
> + u_translate_func trans_func;
> + u_generate_func gen_func;
> + const void *src;
> + void *dst;
> +
> + if (info->indexed) {
> + u_index_translator(pc->primtypes_mask,
> + info->mode, pc->saved_ib.index_size, info->count,
> + pc->api_pv, pc->api_pv,
> + &new_info.mode, &new_ib.index_size, &new_info.count,
> + &trans_func);
> + src = ib->user_buffer;
> + if (!src) {
> + src = pipe_buffer_map(pc->pipe, ib->buffer,
> + PIPE_TRANSFER_READ, &src_transfer);
> + }
> + } else {
> + u_index_generator(pc->primtypes_mask,
> + info->mode, info->start, info->count,
> + pc->api_pv, pc->api_pv,
> + &new_info.mode, &new_ib.index_size, &new_info.count,
> + &gen_func);
> + }
> +
> +
> + new_ib.buffer = pipe_buffer_create(pc->pipe->screen,
> + PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_IMMUTABLE,
> + new_ib.index_size * new_info.count);
> + dst = pipe_buffer_map(pc->pipe, new_ib.buffer,
> + PIPE_TRANSFER_WRITE, &dst_transfer);
> +
> + if (info->indexed) {
> + new_info.min_index = 0;
> + new_info.max_index = ~0;
> + trans_func(src, info->start, new_info.count, dst);
> + } else {
> + new_info.min_index = info->start;
> + new_info.max_index = info->start + new_info.count;
> + gen_func(info->start, new_info.count, dst);
> + }
> +
> + if (src_transfer)
> + pipe_buffer_unmap(pc->pipe, src_transfer);
> +
> + if (dst_transfer)
> + pipe_buffer_unmap(pc->pipe, dst_transfer);
> +
> + /* bind new index buffer: */
> + pc->pipe->set_index_buffer(pc->pipe, &new_ib);
> +
> + /* to the translated draw: */
> + pc->pipe->draw_vbo(pc->pipe, &new_info);
> +
> + /* and then restore saved ib: */
> + pc->pipe->set_index_buffer(pc->pipe, ib);
> +
> + pipe_resource_reference(&new_ib.buffer, NULL);
> +}
> diff --git a/src/gallium/auxiliary/indices/u_primconvert.h b/src/gallium/auxiliary/indices/u_primconvert.h
> new file mode 100644
> index 0000000..67d878c
> --- /dev/null
> +++ b/src/gallium/auxiliary/indices/u_primconvert.h
> @@ -0,0 +1,46 @@
> +/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
> +
> +/*
> + * Copyright (C) 2013 Rob Clark <robclark at freedesktop.org>
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> + * SOFTWARE.
> + *
> + * Authors:
> + * Rob Clark <robclark at freedesktop.org>
> + */
> +
> +#ifndef U_PRIMCONVERT_H_
> +#define U_PRIMCONVERT_H_
> +
> +#include "pipe/p_state.h"
> +
> +struct primconvert_context;
> +
> +struct primconvert_context *util_primconvert_create(struct pipe_context *pipe,
> + uint32_t primtypes_mask);
> +void util_primconvert_destroy(struct primconvert_context *pc);
> +void util_primconvert_save_index_buffer(struct primconvert_context *pc,
> + const struct pipe_index_buffer *ib);
> +void util_primconvert_save_rasterizer_state(struct primconvert_context *pc,
> + const struct pipe_rasterizer_state *rast);
> +void util_primconvert_draw_vbo(struct primconvert_context *pc,
> + const struct pipe_draw_info *info);
> +
> +#endif /* U_PRIMCONVERT_H_ */
>
With formating fixes, etc. Reviewed-by: Brian Paul <brianp at vmware.com>
More information about the mesa-dev
mailing list