Attachment 31731 Details for Bug 25440 – Patch to fix problem above

[patch] Patch to fix problem above

patch3 (text/plain), 5.30 KB, created by Bob Gleitsmann on 2009-12-04 02:35:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Gleitsmann

Created: 2009-12-04 02:35:51 UTC

Size: 5.30 KB

patch

obsolete

>diff --git a/src/gallium/drivers/nv04/nv04_miptree.c b/src/gallium/drivers/nv04/nv04_miptree.c
>index 4fd72c8..9cd55a3 100644
>--- a/src/gallium/drivers/nv04/nv04_miptree.c
>+++ b/src/gallium/drivers/nv04/nv04_miptree.c
>@@ -62,7 +62,7 @@ nv04_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
> 		FREE(mt);
> 		return NULL;
> 	}
>-	
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>@@ -88,6 +88,7 @@ nv04_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
> 	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
> 
> 	pipe_buffer_reference(&mt->buffer, pb);
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>diff --git a/src/gallium/drivers/nv04/nv04_state.h b/src/gallium/drivers/nv04/nv04_state.h
>index 399f750..81d1d2e 100644
>--- a/src/gallium/drivers/nv04/nv04_state.h
>+++ b/src/gallium/drivers/nv04/nv04_state.h
>@@ -31,6 +31,7 @@ struct nv04_rasterizer_state {
> 
> struct nv04_miptree {
> 	struct pipe_texture base;
>+	struct nouveau_bo *bo;
> 
> 	struct pipe_buffer *buffer;
> 	uint total_size;
>diff --git a/src/gallium/drivers/nv10/nv10_miptree.c b/src/gallium/drivers/nv10/nv10_miptree.c
>index b2a6c59..a2e6ab1 100644
>--- a/src/gallium/drivers/nv10/nv10_miptree.c
>+++ b/src/gallium/drivers/nv10/nv10_miptree.c
>@@ -72,6 +72,7 @@ nv10_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
> 	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
> 
> 	pipe_buffer_reference(&mt->buffer, pb);
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>@@ -95,6 +96,7 @@ nv10_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
> 		FREE(mt);
> 		return NULL;
> 	}
>+	mt->bo = nouveau_bo(mt->buffer);
> 	
> 	return &mt->base;
> }
>diff --git a/src/gallium/drivers/nv10/nv10_state.h b/src/gallium/drivers/nv10/nv10_state.h
>index 3a3fd0d..2524ac0 100644
>--- a/src/gallium/drivers/nv10/nv10_state.h
>+++ b/src/gallium/drivers/nv10/nv10_state.h
>@@ -126,6 +126,7 @@ struct nv10_depth_stencil_alpha_state {
> 
> struct nv10_miptree {
> 	struct pipe_texture base;
>+	struct nouveau_bo *bo;
> 
> 	struct pipe_buffer *buffer;
> 	uint total_size;
>diff --git a/src/gallium/drivers/nv20/nv20_miptree.c b/src/gallium/drivers/nv20/nv20_miptree.c
>index 554e28e..2116633 100644
>--- a/src/gallium/drivers/nv20/nv20_miptree.c
>+++ b/src/gallium/drivers/nv20/nv20_miptree.c
>@@ -81,6 +81,7 @@ nv20_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
> 	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
> 
> 	pipe_buffer_reference(&mt->buffer, pb);
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>@@ -136,6 +137,7 @@ nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
> 		FREE(mt);
> 		return NULL;
> 	}
>+	mt->bo = nouveau_bo(mt->buffer);
> 	
> 	return &mt->base;
> }
>diff --git a/src/gallium/drivers/nv20/nv20_state.h b/src/gallium/drivers/nv20/nv20_state.h
>index 34f402f..dde4106 100644
>--- a/src/gallium/drivers/nv20/nv20_state.h
>+++ b/src/gallium/drivers/nv20/nv20_state.h
>@@ -126,6 +126,7 @@ struct nv20_depth_stencil_alpha_state {
> 
> struct nv20_miptree {
> 	struct pipe_texture base;
>+	struct nouveau_bo *bo;
> 
> 	struct pipe_buffer *buffer;
> 	uint total_size;
>diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
>index b4c306d..aaf7087 100644
>--- a/src/gallium/drivers/nv30/nv30_miptree.c
>+++ b/src/gallium/drivers/nv30/nv30_miptree.c
>@@ -120,6 +120,7 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
> 		FREE(mt);
> 		return NULL;
> 	}
>+	mt->bo = nouveau_bo(mt->buffer);
> 
> 	return &mt->base;
> }
>@@ -149,6 +150,7 @@ nv30_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
> 	mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
> 
> 	pipe_buffer_reference(&mt->buffer, pb);
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
>index e6f23bf..e42e872 100644
>--- a/src/gallium/drivers/nv30/nv30_state.h
>+++ b/src/gallium/drivers/nv30/nv30_state.h
>@@ -72,6 +72,7 @@ struct nv30_fragment_program {
> 
> struct nv30_miptree {
> 	struct pipe_texture base;
>+	struct nouveau_bo *bo;
> 
> 	struct pipe_buffer *buffer;
> 	uint total_size;
>diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
>index f73bedf..3ad2d98 100644
>--- a/src/gallium/drivers/nv40/nv40_miptree.c
>+++ b/src/gallium/drivers/nv40/nv40_miptree.c
>@@ -5,6 +5,8 @@
> 
> #include "nv40_context.h"
> 
>+
>+
> static void
> nv40_miptree_layout(struct nv40_miptree *mt)
> {
>@@ -114,7 +116,7 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
> 		FREE(mt);
> 		return NULL;
> 	}
>-
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>@@ -143,6 +145,7 @@ nv40_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
> 	mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
> 
> 	pipe_buffer_reference(&mt->buffer, pb);
>+	mt->bo = nouveau_bo(mt->buffer);
> 	return &mt->base;
> }
> 
>diff --git a/src/gallium/drivers/nv40/nv40_state.h b/src/gallium/drivers/nv40/nv40_state.h
>index 8a9d8c8..192074e 100644
>--- a/src/gallium/drivers/nv40/nv40_state.h
>+++ b/src/gallium/drivers/nv40/nv40_state.h
>@@ -75,6 +75,7 @@ struct nv40_fragment_program {
> 
> struct nv40_miptree {
> 	struct pipe_texture base;
>+	struct nouveau_bo *bo;
> 
> 	struct pipe_buffer *buffer;
> 	uint total_size;

Actions: View | Splinter Review

Attachments on bug 25440: 31731

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.