KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rbug: Fix sampler views and surfaces in context info

This commit is contained in:
Jakob Bornecrantz 2010-05-12 15:33:40 +01:00
parent 21b668e11e
commit 73684216ba
4 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gallium/drivers/rbug/rbug_context.c
View File

@ -535,13 +535,19 @@ rbug_set_framebuffer_state(struct pipe_context *_pipe,
struct pipe_framebuffer_state *state = NULL;
unsigned i;
rb_pipe->curr.nr_cbufs = 0;
memset(rb_pipe->curr.cbufs, 0, sizeof(rb_pipe->curr.cbufs));
/* unwrap the input state */
if (_state) {
memcpy(&unwrapped_state, _state, sizeof(unwrapped_state));
for(i = 0; i < _state->nr_cbufs; i++)
rb_pipe->curr.nr_cbufs = _state->nr_cbufs;
for(i = 0; i < _state->nr_cbufs; i++) {
unwrapped_state.cbufs[i] = rbug_surface_unwrap(_state->cbufs[i]);
for (; i < PIPE_MAX_COLOR_BUFS; i++)
unwrapped_state.cbufs[i] = NULL;
if (_state->cbufs[i])
rb_pipe->curr.cbufs[i] = rbug_resource(_state->cbufs[i]->texture);
}
unwrapped_state.zsbuf = rbug_surface_unwrap(_state->zsbuf);
state = &unwrapped_state;
}
@ -594,12 +600,18 @@ rbug_set_fragment_sampler_views(struct pipe_context *_pipe,
struct pipe_sampler_view **views = NULL;
unsigned i;
if (_views) {
for (i = 0; i < num; i++)
unwrapped_views[i] = rbug_sampler_view_unwrap(_views[i]);
for (; i < PIPE_MAX_SAMPLERS; i++)
unwrapped_views[i] = NULL;
rb_pipe->curr.num_fs_views = 0;
memset(rb_pipe->curr.fs_views, 0, sizeof(rb_pipe->curr.fs_views));
memset(rb_pipe->curr.fs_texs, 0, sizeof(rb_pipe->curr.fs_texs));
memset(unwrapped_views, 0, sizeof(unwrapped_views));
if (_views) {
rb_pipe->curr.num_fs_views = num;
for (i = 0; i < num; i++) {
rb_pipe->curr.fs_views[i] = rbug_sampler_view(_views[i]);
rb_pipe->curr.fs_texs[i] = rbug_resource(_views[i] ? _views[i]->texture : NULL);
unwrapped_views[i] = rbug_sampler_view_unwrap(_views[i]);
}
views = unwrapped_views;
}
@ -617,12 +629,18 @@ rbug_set_vertex_sampler_views(struct pipe_context *_pipe,
struct pipe_sampler_view **views = NULL;
unsigned i;
if (_views) {
for (i = 0; i < num; i++)
unwrapped_views[i] = rbug_sampler_view_unwrap(_views[i]);
for (; i < PIPE_MAX_VERTEX_SAMPLERS; i++)
unwrapped_views[i] = NULL;
rb_pipe->curr.num_vs_views = 0;
memset(rb_pipe->curr.vs_views, 0, sizeof(rb_pipe->curr.vs_views));
memset(rb_pipe->curr.vs_texs, 0, sizeof(rb_pipe->curr.vs_texs));
memset(unwrapped_views, 0, sizeof(unwrapped_views));
if (_views) {
rb_pipe->curr.num_vs_views = num;
for (i = 0; i < num; i++) {
rb_pipe->curr.vs_views[i] = rbug_sampler_view(_views[i]);
rb_pipe->curr.vs_texs[i] = rbug_resource(_views[i]->texture);
unwrapped_views[i] = rbug_sampler_view_unwrap(_views[i]);
}
views = unwrapped_views;
}

10
src/gallium/drivers/rbug/rbug_context.h
View File

@ -50,11 +50,13 @@ struct rbug_context {
struct rbug_shader *vs;
struct rbug_shader *gs;
struct rbug_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
unsigned num_sampler_views;
struct rbug_sampler_view *fs_views[PIPE_MAX_SAMPLERS];
struct rbug_resource *fs_texs[PIPE_MAX_SAMPLERS];
unsigned num_fs_views;
struct rbug_sampler_view *vert_sampler_views[PIPE_MAX_VERTEX_SAMPLERS];
unsigned num_vert_sampler_views;
struct rbug_sampler_view *vs_views[PIPE_MAX_VERTEX_SAMPLERS];
struct rbug_resource *vs_texs[PIPE_MAX_VERTEX_SAMPLERS];
unsigned num_vs_views;
unsigned nr_cbufs;
struct rbug_resource *cbufs[PIPE_MAX_COLOR_BUFS];

6
src/gallium/drivers/rbug/rbug_core.c
View File

@ -337,12 +337,12 @@ rbug_context_info(struct rbug_rbug *tr_rbug, struct rbug_header *header, uint32_
for (i = 0; i < rb_context->curr.nr_cbufs; i++)
cbufs[i] = VOID2U64(rb_context->curr.cbufs[i]);
for (i = 0; i < rb_context->curr.num_sampler_views; i++)
texs[i] = VOID2U64(rb_context->curr.sampler_views[i]);
for (i = 0; i < rb_context->curr.num_fs_views; i++)
texs[i] = VOID2U64(rb_context->curr.fs_texs[i]);
rbug_send_context_info_reply(tr_rbug->con, serial,
VOID2U64(rb_context->curr.vs), VOID2U64(rb_context->curr.fs),
texs, rb_context->curr.num_sampler_views,
texs, rb_context->curr.num_fs_views,
cbufs, rb_context->curr.nr_cbufs,
VOID2U64(rb_context->curr.zsbuf),
rb_context->draw_blocker, rb_context->draw_blocked, NULL);

2
src/gallium/drivers/rbug/rbug_objects.c
View File

@ -133,7 +133,7 @@ rbug_sampler_view_create(struct rbug_context *rb_context,
rb_view->base = *view;
rb_view->base.reference.count = 1;
rb_view->base.texture = NULL;
pipe_resource_reference(&rb_view->base.texture, rb_resource->resource);
pipe_resource_reference(&rb_view->base.texture, &rb_resource->base);
rb_view->base.context = rb_context->pipe;
rb_view->sampler_view = view;