From 93d5cfd8b7c641c5656aed38ad2f9559e09502f0 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 8 Aug 2007 16:42:01 +0100 Subject: Add flush/finish functionality to pipe. Not sure if finish() is the right interface yet. --- src/mesa/pipe/i915simple/Makefile | 1 + src/mesa/pipe/i915simple/i915_batch.h | 9 ++++ src/mesa/pipe/i915simple/i915_context.c | 7 +++ src/mesa/pipe/i915simple/i915_context.h | 6 ++- src/mesa/pipe/i915simple/i915_flush.c | 82 +++++++++++++++++++++++++++++++++ src/mesa/pipe/p_context.h | 4 ++ src/mesa/pipe/p_defines.h | 7 +++ src/mesa/pipe/softpipe/Makefile | 1 + src/mesa/pipe/softpipe/sp_buffer.c | 1 + src/mesa/pipe/softpipe/sp_context.c | 3 ++ src/mesa/pipe/softpipe/sp_flush.c | 57 +++++++++++++++++++++++ src/mesa/pipe/softpipe/sp_flush.h | 36 +++++++++++++++ 12 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 src/mesa/pipe/i915simple/i915_flush.c create mode 100644 src/mesa/pipe/softpipe/sp_flush.c create mode 100644 src/mesa/pipe/softpipe/sp_flush.h diff --git a/src/mesa/pipe/i915simple/Makefile b/src/mesa/pipe/i915simple/Makefile index 4170349893..f8b14220fb 100644 --- a/src/mesa/pipe/i915simple/Makefile +++ b/src/mesa/pipe/i915simple/Makefile @@ -8,6 +8,7 @@ DRIVER_SOURCES = \ i915_blit.c \ i915_buffer.c \ i915_clear.c \ + i915_flush.c \ i915_context.c \ i915_context.c \ i915_debug.c \ diff --git a/src/mesa/pipe/i915simple/i915_batch.h b/src/mesa/pipe/i915simple/i915_batch.h index 77008eee14..b4ca8c38da 100644 --- a/src/mesa/pipe/i915simple/i915_batch.h +++ b/src/mesa/pipe/i915simple/i915_batch.h @@ -28,6 +28,9 @@ #ifndef I915_BATCH_H #define I915_BATCH_H +#include "i915_winsys.h" +#include "i915_debug.h" + #define BATCH_LOCALS #define BEGIN_BATCH( dwords, relocs ) \ @@ -41,4 +44,10 @@ #define ADVANCE_BATCH() +#define FLUSH_BATCH() do { \ +/* i915_dump_batchbuffer( i915, i915->batch_start, BEGIN_BATCH(0, 0) ); */ \ + i915->winsys->batch_flush( i915->winsys ); \ + i915->batch_start = BEGIN_BATCH(0, 0); \ +} while (0) + #endif diff --git a/src/mesa/pipe/i915simple/i915_context.c b/src/mesa/pipe/i915simple/i915_context.c index f39c282981..02b51bea43 100644 --- a/src/mesa/pipe/i915simple/i915_context.c +++ b/src/mesa/pipe/i915simple/i915_context.c @@ -170,6 +170,13 @@ struct pipe_context *i915_create( struct i915_winsys *winsys ) i915_init_region_functions(i915); i915_init_surface_functions(i915); i915_init_state_functions(i915); + i915_init_flush_functions(i915); + + + /* Batch stream debugging is a bit hacked up at the moment: + */ + i915->batch_start = winsys->batch_start( winsys, 0, 0 ); + /* * XXX we could plug GL selection/feedback into the drawing pipeline diff --git a/src/mesa/pipe/i915simple/i915_context.h b/src/mesa/pipe/i915simple/i915_context.h index 060997bfa4..dab5423190 100644 --- a/src/mesa/pipe/i915simple/i915_context.h +++ b/src/mesa/pipe/i915simple/i915_context.h @@ -53,12 +53,13 @@ struct i915_context struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS]; struct pipe_setup_state setup; struct pipe_stencil_state stencil; - struct pipe_texture_object *texture[PIPE_MAX_SAMPLERS]; + struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS]; struct pipe_viewport_state viewport; GLuint dirty; - struct pipe_scissor_state cliprect; + GLuint *batch_start; + struct pipe_scissor_state cliprect; }; #define I915_NEW_VIEWPORT 0x1 @@ -104,6 +105,7 @@ void i915_init_buffer_functions( struct i915_context *i915 ); void i915_init_region_functions( struct i915_context *i915 ); void i915_init_surface_functions( struct i915_context *i915 ); void i915_init_state_functions( struct i915_context *i915 ); +void i915_init_flush_functions( struct i915_context *i915 ); diff --git a/src/mesa/pipe/i915simple/i915_flush.c b/src/mesa/pipe/i915simple/i915_flush.c new file mode 100644 index 0000000000..1cf945e9a2 --- /dev/null +++ b/src/mesa/pipe/i915simple/i915_flush.c @@ -0,0 +1,82 @@ +/************************************************************************** + * + * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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. + * + **************************************************************************/ + +/* Author: + * Keith Whitwell + */ + + +#include "pipe/p_defines.h" +#include "i915_context.h" +#include "i915_reg.h" +#include "i915_batch.h" + +/* There will be actual work to do here. In future we may want a + * fence-like interface instead of finish, and perhaps flush will take + * flags to indicate what type of flush is required. + */ +static void i915_flush( struct pipe_context *pipe, + unsigned flags ) +{ + struct i915_context *i915 = i915_context(pipe); + + /* Do we need to emit an MI_FLUSH command to flush the hardware + * caches? + */ + if (flags) { + unsigned flush = MI_FLUSH; + + if (!(flags & PIPE_FLUSH_RENDER_CACHE)) + flush |= INHIBIT_FLUSH_RENDER_CACHE; + + if (flags & PIPE_FLUSH_TEXTURE_CACHE) + flush |= FLUSH_MAP_CACHE; + + BEGIN_BATCH( 1, 0 ); + OUT_BATCH( flush ); + ADVANCE_BATCH(); + } + + /* If there are no flags, just flush pending commands to hardware: + */ + FLUSH_BATCH(); +} + +static void i915_finish(struct pipe_context *pipe) +{ + struct i915_context *i915 = i915_context(pipe); + + i915_flush( pipe, 0 ); + i915->winsys->batch_wait_idle( i915->winsys ); +} + + +void i915_init_flush_functions( struct i915_context *i915 ) +{ + i915->pipe.flush = i915_flush; + i915->pipe.finish = i915_finish; +} diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h index 3062eda329..23961f4b8f 100644 --- a/src/mesa/pipe/p_context.h +++ b/src/mesa/pipe/p_context.h @@ -219,6 +219,10 @@ struct pipe_context { struct pipe_mipmap_tree *mt ); + void (*flush)( struct pipe_context *pipe, + unsigned flags ); + + void (*finish)( struct pipe_context *pipe ); }; diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h index 77512f8818..9eb4c37434 100644 --- a/src/mesa/pipe/p_defines.h +++ b/src/mesa/pipe/p_defines.h @@ -176,4 +176,11 @@ #define PIPE_MAP_WRITE 2 #define PIPE_MAP_READ_WRITE 3 + +/** + * Flush types: + */ +#define PIPE_FLUSH_RENDER_CACHE 0x1 +#define PIPE_FLUSH_TEXTURE_CACHE 0x2 + #endif diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile index feb167405a..ac83da451d 100644 --- a/src/mesa/pipe/softpipe/Makefile +++ b/src/mesa/pipe/softpipe/Makefile @@ -7,6 +7,7 @@ LIBNAME = softpipe DRIVER_SOURCES = \ sp_buffer.c \ sp_clear.c \ + sp_flush.c \ sp_context.c \ sp_prim_setup.c \ sp_quad.c \ diff --git a/src/mesa/pipe/softpipe/sp_buffer.c b/src/mesa/pipe/softpipe/sp_buffer.c index f3a4718449..27443421a3 100644 --- a/src/mesa/pipe/softpipe/sp_buffer.c +++ b/src/mesa/pipe/softpipe/sp_buffer.c @@ -32,6 +32,7 @@ #include #include "sp_context.h" #include "sp_winsys.h" +#include "sp_buffer.h" diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c index ac5651f9a7..ebc994670a 100644 --- a/src/mesa/pipe/softpipe/sp_context.c +++ b/src/mesa/pipe/softpipe/sp_context.c @@ -36,6 +36,7 @@ #include "sp_buffer.h" #include "sp_clear.h" #include "sp_context.h" +#include "sp_flush.h" #include "sp_prim_setup.h" #include "sp_region.h" #include "sp_state.h" @@ -214,6 +215,8 @@ struct pipe_context *softpipe_create( struct softpipe_winsys *sws ) softpipe->pipe.draw_vb = softpipe_draw_vb; softpipe->pipe.draw_vertices = softpipe_draw_vertices; softpipe->pipe.clear = softpipe_clear; + softpipe->pipe.flush = softpipe_flush; + softpipe->pipe.finish = softpipe_finish; softpipe->pipe.reset_occlusion_counter = softpipe_reset_occlusion_counter; softpipe->pipe.get_occlusion_counter = softpipe_get_occlusion_counter; diff --git a/src/mesa/pipe/softpipe/sp_flush.c b/src/mesa/pipe/softpipe/sp_flush.c new file mode 100644 index 0000000000..aa609469a6 --- /dev/null +++ b/src/mesa/pipe/softpipe/sp_flush.c @@ -0,0 +1,57 @@ +/************************************************************************** + * + * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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. + * + **************************************************************************/ + +/* Author: + * Keith Whitwell + */ + + +#include "pipe/p_defines.h" +#include "sp_flush.h" +#include "sp_context.h" + +/* There will be actual work to do here. In future we may want a + * fence-like interface instead of finish, and perhaps flush will take + * flags to indicate what type of flush is required. + */ +void +softpipe_flush( struct pipe_context *pipe, + unsigned flags ) +{ + /* - flush the quad pipeline + * - flush the texture cache + * - flush the render cache + */ +} + +void +softpipe_finish(struct pipe_context *pipe) +{ + /* Just calls into flush() + */ + softpipe_flush( pipe, 0 ); +} diff --git a/src/mesa/pipe/softpipe/sp_flush.h b/src/mesa/pipe/softpipe/sp_flush.h new file mode 100644 index 0000000000..5e204f87a5 --- /dev/null +++ b/src/mesa/pipe/softpipe/sp_flush.h @@ -0,0 +1,36 @@ +/************************************************************************** + * + * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * All Rights Reserved. + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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. + * + **************************************************************************/ + +#ifndef SP_FLUSH_H +#define SP_FLUSH_H + +struct pipe_context; + +void softpipe_finish(struct pipe_context *pipe); +void softpipe_flush(struct pipe_context *pipe, unsigned flags ); + +#endif -- cgit v1.2.3