[Mesa-dev] [PATCH 2/4] i965: create code path to handle primitive restart in hardware
Ian Romanick
idr at freedesktop.org
Mon May 14 16:29:25 PDT 2012
On 05/13/2012 07:06 AM, Jordan Justen wrote:
> For newer hardware we disable the VBO module's software handling
> of primitive restart. We now handle primitive restarts in
> brw_handle_primitive_restart.
>
> The initial version of brw_handle_primitive_restart simply calls
> vbo_sw_primitive_restart, and therefore still uses the VBO
> module software primitive restart support.
>
> Signed-off-by: Jordan Justen<jordan.l.justen at intel.com>
> ---
> src/mesa/drivers/dri/i965/Makefile.sources | 1 +
> src/mesa/drivers/dri/i965/brw_context.c | 2 +
> src/mesa/drivers/dri/i965/brw_context.h | 5 ++
> src/mesa/drivers/dri/i965/brw_draw.c | 6 ++
> src/mesa/drivers/dri/i965/brw_draw.h | 10 ++-
> src/mesa/drivers/dri/i965/brw_primitive_restart.c | 80 +++++++++++++++++++++
> src/mesa/drivers/dri/intel/intel_extensions.c | 4 +-
> 7 files changed, 104 insertions(+), 4 deletions(-)
> create mode 100644 src/mesa/drivers/dri/i965/brw_primitive_restart.c
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> index c99a034..36d4831 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -55,6 +55,7 @@ i965_C_FILES = \
> brw_misc_state.c \
> brw_optimize.c \
> brw_program.c \
> + brw_primitive_restart.c \
> brw_queryobj.c \
> brw_sf.c \
> brw_sf_emit.c \
> diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
> index 65de260..3ef5a57 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.c
> +++ b/src/mesa/drivers/dri/i965/brw_context.c
> @@ -295,6 +295,8 @@ brwCreateContext(int api,
> brw->has_negative_rhw_bug = true;
> }
>
> + brw->prim_restart.in_progress = false;
> +
> brw_init_state( brw );
>
> brw->curbe.last_buf = calloc(1, 4096);
> diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
> index 141fb65..dabfdf4 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.h
> +++ b/src/mesa/drivers/dri/i965/brw_context.h
> @@ -1000,6 +1000,11 @@ struct brw_context
>
> uint32_t render_target_format[MESA_FORMAT_COUNT];
> bool format_supported_as_render_target[MESA_FORMAT_COUNT];
> +
> + /* PrimitiveRestart */
> + struct {
> + bool in_progress;
> + } prim_restart;
> };
>
>
> diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
> index 813f7c8..16ce994 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw.c
> @@ -545,6 +545,12 @@ void brw_draw_prims( struct gl_context *ctx,
> if (!_mesa_check_conditional_render(ctx))
> return;
>
> + /* Handle primitive restart if needed */
> + if (brw_handle_primitive_restart(ctx, prim, nr_prims, ib)) {
> + /* The draw was handled, so we can exit now */
> + return;
> + }
> +
> if (!vbo_all_varyings_in_vbos(arrays)) {
> if (!index_bounds_valid)
> vbo_get_minmax_indices(ctx, prim, ib,&min_index,&max_index, nr_prims);
> diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h
> index 2cc4cb3..2f25e5c 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw.h
> +++ b/src/mesa/drivers/dri/i965/brw_draw.h
> @@ -30,9 +30,7 @@
>
> #include "main/mtypes.h" /* for struct gl_context... */
> #include "vbo/vbo.h"
> -
> -struct brw_context;
> -
> +#include "brw_context.h"
Why?
>
> void brw_draw_prims( struct gl_context *ctx,
> const struct _mesa_prim *prims,
> @@ -51,4 +49,10 @@ void brw_draw_destroy( struct brw_context *brw );
> void brw_init_current_values(struct gl_context *ctx,
> struct gl_client_array *arrays);
>
> +/* brw_primitive_restart.c */
> +bool brw_handle_primitive_restart(struct gl_context *ctx,
> + const struct _mesa_prim *prim,
> + GLuint nr_prims,
> + const struct _mesa_index_buffer *ib);
> +
> #endif
> diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> new file mode 100644
> index 0000000..20a9226
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
> @@ -0,0 +1,80 @@
> +/*
> + * Copyright © 2012 Intel Corporation
> + *
> + * 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:
> + * Jordan Justen<jordan.l.justen at intel.com>
> + *
> + */
> +
> +#include "main/imports.h"
> +#include "main/bufferobj.h"
> +
> +#include "brw_context.h"
> +#include "brw_draw.h"
> +
> +bool brw_handle_primitive_restart(struct gl_context *ctx,
> + const struct _mesa_prim *prim,
> + GLuint nr_prims,
> + const struct _mesa_index_buffer *ib)
> +{
> + struct brw_context *brw = brw_context(ctx);
> +
> + /* We only need to handle cases where there is an index buffer. */
> + if (ib == NULL) {
> + return false;
> + }
> +
> + /* If the driver has requested software handling of primitive restarts,
> + * then the VBO module has already taken care of things, and we can
> + * just draw as normal.
> + */
> + if (ctx->Const.PrimitiveRestartInSoftware) {
> + return false;
> + }
> +
> + /* If we have set the in_progress flag, then we are in the middle
> + * of handling the primitive restart draw.
> + */
> + if (brw->prim_restart.in_progress) {
> + return false;
> + }
> +
> + /* If PrimitiveRestart is not enabled, then we aren't concerned about
> + * handling this draw.
> + */
> + if (!(ctx->Array.PrimitiveRestart)) {
> + return false;
> + }
> +
> + /* Signal that we are in the process of handling the
> + * primitive restart draw
> + */
> + brw->prim_restart.in_progress = true;
> +
> + vbo_sw_primitive_restart(ctx, prim, nr_prims, ib);
> +
> + brw->prim_restart.in_progress = false;
> +
> + /* The primitive restart draw was completed, so return true. */
> + return true;
> +}
> +
> diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
> index 858606d..9c64e0f 100755
> --- a/src/mesa/drivers/dri/intel/intel_extensions.c
> +++ b/src/mesa/drivers/dri/intel/intel_extensions.c
> @@ -168,6 +168,8 @@ intelInitExtensions(struct gl_context *ctx)
> ctx->Extensions.EXT_texture_compression_s3tc = true;
> }
>
> - ctx->Const.PrimitiveRestartInSoftware = GL_TRUE;
> + if (intel->gen< 4) {
> + ctx->Const.PrimitiveRestartInSoftware = GL_TRUE;
> + }
> ctx->Extensions.NV_primitive_restart = true;
I think we shouldn't enable NV_primitive_restart on pre-GEN4. I don't
see a compelling case for software emulation of it on Pineview or i830.
> }
More information about the mesa-dev
mailing list