[Mesa-dev] [PATCH 04/11] gallium: utility helper functions for stream output
Christoph Bumiller
e0425955 at student.tuwien.ac.at
Fri Dec 9 10:21:04 PST 2011
From: Marek Olšák <maraeo at gmail.com>
---
src/gallium/auxiliary/tgsi/tgsi_ureg.c | 9 +++++++--
src/gallium/auxiliary/tgsi/tgsi_ureg.h | 18 ++++++++++++++----
src/gallium/auxiliary/util/u_debug_describe.c | 10 ++++++++++
src/gallium/auxiliary/util/u_debug_describe.h | 2 ++
src/gallium/auxiliary/util/u_inlines.h | 12 ++++++++++++
src/gallium/auxiliary/util/u_simple_shaders.c | 14 +++++++++++++-
src/gallium/auxiliary/util/u_simple_shaders.h | 8 ++++++++
7 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
index daa77ef..d3adf32 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c
@@ -1574,14 +1574,19 @@ const struct tgsi_token *ureg_finalize( struct ureg_program *ureg )
void *ureg_create_shader( struct ureg_program *ureg,
- struct pipe_context *pipe )
+ struct pipe_context *pipe,
+ const struct pipe_stream_output_info *so )
{
struct pipe_shader_state state;
state.tokens = ureg_finalize(ureg);
if(!state.tokens)
return NULL;
- memset(&state.stream_output, 0, sizeof(state.stream_output));
+
+ if (so)
+ state.stream_output = *so;
+ else
+ memset(&state.stream_output, 0, sizeof(state.stream_output));
if (ureg->processor == TGSI_PROCESSOR_VERTEX)
return pipe->create_vs_state( pipe, &state );
diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index 8f5f22e..72b837a 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -37,6 +37,7 @@ extern "C" {
#endif
struct ureg_program;
+struct pipe_stream_output_info;
/* Almost a tgsi_src_register, but we need to pull in the Absolute
* flag from the _ext token. Indirect flag always implies ADDR[0].
@@ -97,7 +98,8 @@ ureg_finalize( struct ureg_program * );
*/
void *
ureg_create_shader( struct ureg_program *,
- struct pipe_context *pipe );
+ struct pipe_context *pipe,
+ const struct pipe_stream_output_info *so );
/* Alternately, return the built token stream and hand ownership of
@@ -120,14 +122,22 @@ ureg_destroy( struct ureg_program * );
* Convenience routine:
*/
static INLINE void *
-ureg_create_shader_and_destroy( struct ureg_program *p,
- struct pipe_context *pipe )
+ureg_create_shader_with_so_and_destroy( struct ureg_program *p,
+ struct pipe_context *pipe,
+ const struct pipe_stream_output_info *so )
{
- void *result = ureg_create_shader( p, pipe );
+ void *result = ureg_create_shader( p, pipe, so );
ureg_destroy( p );
return result;
}
+static INLINE void *
+ureg_create_shader_and_destroy( struct ureg_program *p,
+ struct pipe_context *pipe )
+{
+ return ureg_create_shader_with_so_and_destroy(p, pipe, NULL);
+}
+
/***********************************************************************
* Build shader properties:
diff --git a/src/gallium/auxiliary/util/u_debug_describe.c b/src/gallium/auxiliary/util/u_debug_describe.c
index 3574acc..df73ed8 100644
--- a/src/gallium/auxiliary/util/u_debug_describe.c
+++ b/src/gallium/auxiliary/util/u_debug_describe.c
@@ -79,3 +79,13 @@ debug_describe_sampler_view(char* buf, const struct pipe_sampler_view *ptr)
debug_describe_resource(res, ptr->texture);
util_sprintf(buf, "pipe_sampler_view<%s,%s>", res, util_format_short_name(ptr->format));
}
+
+void
+debug_describe_so_target(char* buf,
+ const struct pipe_stream_output_target *ptr)
+{
+ char res[128];
+ debug_describe_resource(res, ptr->buffer);
+ util_sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
+ ptr->buffer_offset, ptr->buffer_size);
+}
diff --git a/src/gallium/auxiliary/util/u_debug_describe.h b/src/gallium/auxiliary/util/u_debug_describe.h
index 26d1f80..4f7882b 100644
--- a/src/gallium/auxiliary/util/u_debug_describe.h
+++ b/src/gallium/auxiliary/util/u_debug_describe.h
@@ -41,6 +41,8 @@ void debug_describe_reference(char* buf, const struct pipe_reference*ptr);
void debug_describe_resource(char* buf, const struct pipe_resource *ptr);
void debug_describe_surface(char* buf, const struct pipe_surface *ptr);
void debug_describe_sampler_view(char* buf, const struct pipe_sampler_view *ptr);
+void debug_describe_so_target(char* buf,
+ const struct pipe_stream_output_target *ptr);
#ifdef __cplusplus
}
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h
index ddb81b5..4428390 100644
--- a/src/gallium/auxiliary/util/u_inlines.h
+++ b/src/gallium/auxiliary/util/u_inlines.h
@@ -136,6 +136,18 @@ pipe_sampler_view_reference(struct pipe_sampler_view **ptr, struct pipe_sampler_
}
static INLINE void
+pipe_so_target_reference(struct pipe_stream_output_target **ptr,
+ struct pipe_stream_output_target *target)
+{
+ struct pipe_stream_output_target *old = *ptr;
+
+ if (pipe_reference_described(&(*ptr)->reference, &target->reference,
+ (debug_reference_descriptor)debug_describe_so_target))
+ old->context->stream_output_target_destroy(old->context, old);
+ *ptr = target;
+}
+
+static INLINE void
pipe_surface_reset(struct pipe_context *ctx, struct pipe_surface* ps,
struct pipe_resource *pt, unsigned level, unsigned layer,
unsigned flags)
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index b0f2dd8..320c0f7 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -56,6 +56,18 @@ util_make_vertex_passthrough_shader(struct pipe_context *pipe,
const uint *semantic_names,
const uint *semantic_indexes)
{
+ return util_make_vertex_passthrough_shader_with_so(pipe, num_attribs,
+ semantic_names,
+ semantic_indexes, NULL);
+}
+
+void *
+util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe,
+ uint num_attribs,
+ const uint *semantic_names,
+ const uint *semantic_indexes,
+ const struct pipe_stream_output_info *so)
+{
struct ureg_program *ureg;
uint i;
@@ -78,7 +90,7 @@ util_make_vertex_passthrough_shader(struct pipe_context *pipe,
ureg_END( ureg );
- return ureg_create_shader_and_destroy( ureg, pipe );
+ return ureg_create_shader_with_so_and_destroy( ureg, pipe, so );
}
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index 1bfec18..5f31b72 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -35,6 +35,7 @@
struct pipe_context;
struct pipe_shader_state;
+struct pipe_stream_output_info;
#ifdef __cplusplus
@@ -48,6 +49,13 @@ util_make_vertex_passthrough_shader(struct pipe_context *pipe,
const uint *semantic_names,
const uint *semantic_indexes);
+extern void *
+util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe,
+ uint num_attribs,
+ const uint *semantic_names,
+ const uint *semantic_indexes,
+ const struct pipe_stream_output_info *so);
+
extern void *
util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
--
1.7.3.4
More information about the mesa-dev
mailing list