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

freedreno: remove tex_resource 

pipe_sampler_view already contains a texture, remove the redundant
tex_resource member which pointed at the same thing.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ilia Mirkin 2015-04-02 22:26:03 -04:00 committed by Rob Clark
parent 6cd9c94ce4
commit bfb0a8eb69
9 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/freedreno/a2xx/fd2_emit.c
View File

@ -140,7 +140,7 @@ emit_texture(struct fd_ringbuffer *ring, struct fd_context *ctx,
OUT_RING(ring, 0x00010000 + (0x6 * const_idx));
OUT_RING(ring, sampler->tex0 | view->tex0);
OUT_RELOC(ring, view->tex_resource->bo, 0, view->fmt, 0);
OUT_RELOC(ring, fd_resource(view->base.texture)->bo, 0, view->fmt, 0);
OUT_RING(ring, view->tex2);
OUT_RING(ring, sampler->tex3 | view->tex3);
OUT_RING(ring, sampler->tex4);

1
src/gallium/drivers/freedreno/a2xx/fd2_texture.c
View File

@ -136,7 +136,6 @@ fd2_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
so->base.reference.count = 1;
so->base.context = pctx;
so->tex_resource = rsc;
so->fmt = fd2_pipe2surface(cso->format);
so->tex0 = A2XX_SQ_TEX_0_PITCH(rsc->slices[0].pitch);

1
src/gallium/drivers/freedreno/a2xx/fd2_texture.h
View File

@ -50,7 +50,6 @@ fd2_sampler_stateobj(struct pipe_sampler_state *samp)
struct fd2_pipe_sampler_view {
struct pipe_sampler_view base;
struct fd_resource *tex_resource;
enum a2xx_sq_surfaceformat fmt;
uint32_t tex0, tex2, tex3;
};

2
src/gallium/drivers/freedreno/a3xx/fd3_emit.c
View File

@ -262,7 +262,7 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
const struct fd3_pipe_sampler_view *view = tex->textures[i] ?
fd3_pipe_sampler_view(tex->textures[i]) :
&dummy_view;
struct fd_resource *rsc = view->tex_resource;
struct fd_resource *rsc = fd_resource(view->base.texture);
unsigned start = view->base.u.tex.first_level;
unsigned end = view->base.u.tex.last_level;

2
src/gallium/drivers/freedreno/a3xx/fd3_texture.c
View File

@ -223,8 +223,6 @@ fd3_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
so->base.reference.count = 1;
so->base.context = pctx;
so->tex_resource = rsc;
so->texconst0 =
A3XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
A3XX_TEX_CONST_0_FMT(fd3_pipe2tex(cso->format)) |

1
src/gallium/drivers/freedreno/a3xx/fd3_texture.h
View File

@ -51,7 +51,6 @@ fd3_sampler_stateobj(struct pipe_sampler_state *samp)
struct fd3_pipe_sampler_view {
struct pipe_sampler_view base;
struct fd_resource *tex_resource;
uint32_t texconst0, texconst1, texconst2, texconst3;
};

2
src/gallium/drivers/freedreno/a4xx/fd4_emit.c
View File

@ -207,7 +207,7 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
const struct fd4_pipe_sampler_view *view = tex->textures[i] ?
fd4_pipe_sampler_view(tex->textures[i]) :
&dummy_view;
struct fd_resource *rsc = view->tex_resource;
struct fd_resource *rsc = fd_resource(view->base.texture);
unsigned start = view->base.u.tex.first_level;
uint32_t offset = fd_resource_offset(rsc, start, 0);

2
src/gallium/drivers/freedreno/a4xx/fd4_texture.c
View File

@ -162,8 +162,6 @@ fd4_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
so->base.reference.count = 1;
so->base.context = pctx;
so->tex_resource = rsc;
so->texconst0 =
A4XX_TEX_CONST_0_TYPE(tex_type(prsc->target)) |
A4XX_TEX_CONST_0_FMT(fd4_pipe2tex(cso->format)) |

1
src/gallium/drivers/freedreno/a4xx/fd4_texture.h
View File

@ -50,7 +50,6 @@ fd4_sampler_stateobj(struct pipe_sampler_state *samp)
struct fd4_pipe_sampler_view {
struct pipe_sampler_view base;
struct fd_resource *tex_resource;
uint32_t texconst0, texconst1, texconst2, texconst3, textconst4;
};