X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_cb_xformfb.c;h=4126e64345b35d0c5a624181d50501c60c2b4b1d;hb=a03e24aa7faafe2dca77150e709727d4276b08cb;hp=749e88e8dbccce58fc06c6e7818bc3606a6b98ac;hpb=1218430e1200a08cd64b6555d3fd1fd0274ad9e5;p=mesa.git diff --git a/src/mesa/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c index 749e88e8dbc..4126e64345b 100644 --- a/src/mesa/state_tracker/st_cb_xformfb.c +++ b/src/mesa/state_tracker/st_cb_xformfb.c @@ -30,104 +30,207 @@ * Transform feedback functions. * * \author Brian Paul + * Marek Olšák */ -#include "main/imports.h" +#include "main/bufferobj.h" #include "main/context.h" #include "main/transformfeedback.h" +#include "util/u_memory.h" +#include "st_cb_bufferobjects.h" #include "st_cb_xformfb.h" +#include "st_context.h" +#include "pipe/p_context.h" +#include "util/u_draw.h" +#include "util/u_inlines.h" +#include "cso_cache/cso_context.h" -#if FEATURE_EXT_transform_feedback +struct st_transform_feedback_object { + struct gl_transform_feedback_object base; + + unsigned num_targets; + struct pipe_stream_output_target *targets[PIPE_MAX_SO_BUFFERS]; + + /* This encapsulates the count that can be used as a source for draw_vbo. + * It contains stream output targets from the last call of + * EndTransformFeedback for each stream. */ + struct pipe_stream_output_target *draw_count[MAX_VERTEX_STREAMS]; +}; + +static inline struct st_transform_feedback_object * +st_transform_feedback_object(struct gl_transform_feedback_object *obj) +{ + return (struct st_transform_feedback_object *) obj; +} -#if 0 static struct gl_transform_feedback_object * -st_new_transform_feedback(GLcontext *ctx, GLuint name) +st_new_transform_feedback(struct gl_context *ctx, GLuint name) { - struct gl_transform_feedback_object *obj; - obj = CALLOC_STRUCT(gl_transform_feedback_object); - if (obj) { - obj->Name = name; - obj->RefCount = 1; - } - return obj; + struct st_transform_feedback_object *obj; + + obj = CALLOC_STRUCT(st_transform_feedback_object); + if (!obj) + return NULL; + + _mesa_init_transform_feedback_object(&obj->base, name); + + return &obj->base; } -#endif -#if 0 + static void -st_delete_transform_feedback(GLcontext *ctx, +st_delete_transform_feedback(struct gl_context *ctx, struct gl_transform_feedback_object *obj) { - GLuint i; + struct st_transform_feedback_object *sobj = + st_transform_feedback_object(obj); + unsigned i; - for (i = 0; i < Elements(obj->Buffers); i++) { - _mesa_reference_buffer_object(ctx, &obj->Buffers[i], NULL); + for (i = 0; i < ARRAY_SIZE(sobj->draw_count); i++) + pipe_so_target_reference(&sobj->draw_count[i], NULL); + + /* Unreference targets. */ + for (i = 0; i < sobj->num_targets; i++) { + pipe_so_target_reference(&sobj->targets[i], NULL); } - free(obj); + _mesa_delete_transform_feedback_object(ctx, obj); } -#endif +/* XXX Do we really need the mode? */ static void -st_begin_transform_feedback(GLcontext *ctx, GLenum mode, +st_begin_transform_feedback(struct gl_context *ctx, GLenum mode, struct gl_transform_feedback_object *obj) { - /* to-do */ + struct st_context *st = st_context(ctx); + struct pipe_context *pipe = st->pipe; + struct st_transform_feedback_object *sobj = + st_transform_feedback_object(obj); + unsigned i, max_num_targets; + unsigned offsets[PIPE_MAX_SO_BUFFERS] = {0}; + + max_num_targets = MIN2(ARRAY_SIZE(sobj->base.Buffers), + ARRAY_SIZE(sobj->targets)); + + /* Convert the transform feedback state into the gallium representation. */ + for (i = 0; i < max_num_targets; i++) { + struct st_buffer_object *bo = st_buffer_object(sobj->base.Buffers[i]); + + if (bo && bo->buffer) { + unsigned stream = obj->program->sh.LinkedTransformFeedback-> + Buffers[i].Stream; + + /* Check whether we need to recreate the target. */ + if (!sobj->targets[i] || + sobj->targets[i] == sobj->draw_count[stream] || + sobj->targets[i]->buffer != bo->buffer || + sobj->targets[i]->buffer_offset != sobj->base.Offset[i] || + sobj->targets[i]->buffer_size != sobj->base.Size[i]) { + /* Create a new target. */ + struct pipe_stream_output_target *so_target = + pipe->create_stream_output_target(pipe, bo->buffer, + sobj->base.Offset[i], + sobj->base.Size[i]); + + pipe_so_target_reference(&sobj->targets[i], NULL); + sobj->targets[i] = so_target; + } + + sobj->num_targets = i+1; + } else { + pipe_so_target_reference(&sobj->targets[i], NULL); + } + } + + /* Start writing at the beginning of each target. */ + cso_set_stream_outputs(st->cso_context, sobj->num_targets, + sobj->targets, offsets); } static void -st_end_transform_feedback(GLcontext *ctx, - struct gl_transform_feedback_object *obj) +st_pause_transform_feedback(struct gl_context *ctx, + struct gl_transform_feedback_object *obj) { - /* to-do */ + struct st_context *st = st_context(ctx); + cso_set_stream_outputs(st->cso_context, 0, NULL, NULL); } static void -st_pause_transform_feedback(GLcontext *ctx, - struct gl_transform_feedback_object *obj) +st_resume_transform_feedback(struct gl_context *ctx, + struct gl_transform_feedback_object *obj) { - /* to-do */ + struct st_context *st = st_context(ctx); + struct st_transform_feedback_object *sobj = + st_transform_feedback_object(obj); + unsigned offsets[PIPE_MAX_SO_BUFFERS]; + unsigned i; + + for (i = 0; i < PIPE_MAX_SO_BUFFERS; i++) + offsets[i] = (unsigned)-1; + + cso_set_stream_outputs(st->cso_context, sobj->num_targets, + sobj->targets, offsets); } static void -st_resume_transform_feedback(GLcontext *ctx, - struct gl_transform_feedback_object *obj) +st_end_transform_feedback(struct gl_context *ctx, + struct gl_transform_feedback_object *obj) { - /* to-do */ + struct st_context *st = st_context(ctx); + struct st_transform_feedback_object *sobj = + st_transform_feedback_object(obj); + unsigned i; + + cso_set_stream_outputs(st->cso_context, 0, NULL, NULL); + + /* The next call to glDrawTransformFeedbackStream should use the vertex + * count from the last call to glEndTransformFeedback. + * Therefore, save the targets for each stream. + * + * NULL means the vertex counter is 0 (initial state). + */ + for (i = 0; i < ARRAY_SIZE(sobj->draw_count); i++) + pipe_so_target_reference(&sobj->draw_count[i], NULL); + + for (i = 0; i < ARRAY_SIZE(sobj->targets); i++) { + unsigned stream = obj->program->sh.LinkedTransformFeedback-> + Buffers[i].Stream; + + /* Is it not bound or already set for this stream? */ + if (!sobj->targets[i] || sobj->draw_count[stream]) + continue; + + pipe_so_target_reference(&sobj->draw_count[stream], sobj->targets[i]); + } } -static void -st_draw_transform_feedback(GLcontext *ctx, GLenum mode, - struct gl_transform_feedback_object *obj) +bool +st_transform_feedback_draw_init(struct gl_transform_feedback_object *obj, + unsigned stream, struct pipe_draw_info *out) { - /* XXX to do */ - /* - * Get number of vertices in obj's feedback buffer. - * Call ctx->Exec.DrawArrays(mode, 0, count); - */ + struct st_transform_feedback_object *sobj = + st_transform_feedback_object(obj); + + out->count_from_stream_output = sobj->draw_count[stream]; + return out->count_from_stream_output != NULL; } void st_init_xformfb_functions(struct dd_function_table *functions) { - /* let core Mesa plug in its functions */ - _mesa_init_transform_feedback_functions(functions); - - /* then override a few: */ + functions->NewTransformFeedback = st_new_transform_feedback; + functions->DeleteTransformFeedback = st_delete_transform_feedback; functions->BeginTransformFeedback = st_begin_transform_feedback; functions->EndTransformFeedback = st_end_transform_feedback; functions->PauseTransformFeedback = st_pause_transform_feedback; functions->ResumeTransformFeedback = st_resume_transform_feedback; - functions->DrawTransformFeedback = st_draw_transform_feedback; } - -#endif /* FEATURE_EXT_transform_feedback */