Attachment 115623 Details for Bug 90363 – Ilia's attempted fix

[patch] Ilia's attempted fix

ilia2.txt (text/plain), 3.81 KB, created by Matteo Bruni on 2015-05-07 16:51:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matteo Bruni

Created: 2015-05-07 16:51:46 UTC

Size: 3.81 KB

patch

obsolete

>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c
>index 2cfd5db..437e3f4 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_context.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c
>@@ -138,8 +138,10 @@ nv50_destroy(struct pipe_context *pipe)
> {
>    struct nv50_context *nv50 = nv50_context(pipe);
> 
>-   if (nv50_context_screen(nv50)->cur_ctx == nv50)
>-      nv50_context_screen(nv50)->cur_ctx = NULL;
>+   if (nv50->screen->cur_ctx == nv50) {
>+      nv50->screen->cur_ctx = NULL;
>+      nv50->screen->cur_state = nv50->state;
>+   }
>    nouveau_pushbuf_bufctx(nv50->base.pushbuf, NULL);
>    nouveau_pushbuf_kick(nv50->base.pushbuf, nv50->base.pushbuf->channel);
> 
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.h b/src/gallium/drivers/nouveau/nv50/nv50_context.h
>index 45eb554..c002f85 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_context.h
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_context.h
>@@ -104,28 +104,7 @@ struct nv50_context {
>    uint32_t dirty;
>    boolean cb_dirty;
> 
>-   struct {
>-      uint32_t instance_elts; /* bitmask of per-instance elements */
>-      uint32_t instance_base;
>-      uint32_t interpolant_ctrl;
>-      uint32_t semantic_color;
>-      uint32_t semantic_psize;
>-      int32_t index_bias;
>-      boolean uniform_buffer_bound[3];
>-      boolean prim_restart;
>-      boolean point_sprite;
>-      boolean rt_serialize;
>-      boolean flushed;
>-      boolean rasterizer_discard;
>-      uint8_t tls_required;
>-      boolean new_tls_space;
>-      uint8_t num_vtxbufs;
>-      uint8_t num_vtxelts;
>-      uint8_t num_textures[3];
>-      uint8_t num_samplers[3];
>-      uint8_t prim_size;
>-      uint16_t scissor;
>-   } state;
>+   struct nv50_context_state state;
> 
>    struct nv50_blend_stateobj *blend;
>    struct nv50_rasterizer_stateobj *rast;
>@@ -191,12 +170,6 @@ nv50_context(struct pipe_context *pipe)
>    return (struct nv50_context *)pipe;
> }
> 
>-static INLINE struct nv50_screen *
>-nv50_context_screen(struct nv50_context *nv50)
>-{
>-   return nv50_screen(&nv50->base.screen->base);
>-}
>-
> /* return index used in nv50_context arrays for a specific shader type */
> static INLINE unsigned
> nv50_context_shader_stage(unsigned pipe)
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.h b/src/gallium/drivers/nouveau/nv50/nv50_screen.h
>index f8ce365..f2927dc 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.h
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.h
>@@ -25,10 +25,34 @@ struct nv50_context;
> 
> struct nv50_blitter;
> 
>+struct nv50_context_state {
>+   uint32_t instance_elts; /* bitmask of per-instance elements */
>+   uint32_t instance_base;
>+   uint32_t interpolant_ctrl;
>+   uint32_t semantic_color;
>+   uint32_t semantic_psize;
>+   int32_t index_bias;
>+   boolean uniform_buffer_bound[3];
>+   boolean prim_restart;
>+   boolean point_sprite;
>+   boolean rt_serialize;
>+   boolean flushed;
>+   boolean rasterizer_discard;
>+   uint8_t tls_required;
>+   boolean new_tls_space;
>+   uint8_t num_vtxbufs;
>+   uint8_t num_vtxelts;
>+   uint8_t num_textures[3];
>+   uint8_t num_samplers[3];
>+   uint8_t prim_size;
>+   uint16_t scissor;
>+};
>+
> struct nv50_screen {
>    struct nouveau_screen base;
> 
>    struct nv50_context *cur_ctx;
>+   struct nv50_context_state cur_state;
> 
>    struct nouveau_bo *code;
>    struct nouveau_bo *uniforms;
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>index 85e19b4..dd3b7cd 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>@@ -394,6 +394,8 @@ nv50_switch_pipe_context(struct nv50_context *ctx_to)
> 
>    if (ctx_from)
>       ctx_to->state = ctx_from->state;
>+   else
>+      ctx_to->state = ctx_to->screen->cur_state;
> 
>    ctx_to->dirty = ~0;
>    ctx_to->viewports_dirty = ~0;

Actions: View | Splinter Review

Attachments on bug 90363: 115622 | 115623 | 115624

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.